diff --git a/apps/filesystem_serving/api.py b/apps/filesystem_serving/api.py
index de22b8235a..2a75e33533 100644
--- a/apps/filesystem_serving/api.py
+++ b/apps/filesystem_serving/api.py
@@ -3,12 +3,12 @@ import os
 from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext_lazy as _
 
+from documents.conf.settings import AVAILABLE_INDEXING_FUNCTIONS
 
 from filesystem_serving.conf.settings import FILESERVING_ENABLE
 from filesystem_serving.conf.settings import FILESERVING_PATH
 from filesystem_serving.conf.settings import SLUGIFY_PATHS
 from filesystem_serving.conf.settings import MAX_RENAME_COUNT
-from filesystem_serving.conf.settings import AVAILABLE_INDEXING_FUNCTIONS
 
 from models import DocumentMetadataIndex, Document
 
diff --git a/apps/main/views.py b/apps/main/views.py
index 82c8644c35..9735526a26 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -26,6 +26,7 @@ def check_settings(request):
     settings = [
         {'name':'DOCUMENTS_METADATA_AVAILABLE_FUNCTIONS', 'value':documents_settings.AVAILABLE_FUNCTIONS},
         {'name':'DOCUMENTS_METADATA_AVAILABLE_MODELS', 'value':documents_settings.AVAILABLE_MODELS},
+        {'name':'DOCUMENTS_INDEXING_AVAILABLE_INDEXING_FUNCTIONS', 'value':documents.AVAILABLE_INDEXING_FUNCTIONS},
         {'name':'DOCUMENTS_USE_STAGING_DIRECTORY', 'value':documents_settings.USE_STAGING_DIRECTORY},
         {'name':'DOCUMENTS_STAGING_DIRECTORY', 'value':documents_settings.STAGING_DIRECTORY, 'exists':True},
         {'name':'DOCUMENTS_DELETE_STAGING_FILE_AFTER_UPLOAD', 'value':documents_settings.DELETE_STAGING_FILE_AFTER_UPLOAD},
@@ -53,7 +54,6 @@ def check_settings(request):
         {'name':'FILESYSTEM_FILESERVING_PATH', 'value':filesystem_serving_settings.FILESERVING_PATH, 'exists':True},
         {'name':'FILESYSTEM_SLUGIFY_PATHS', 'value':filesystem_serving_settings.SLUGIFY_PATHS},
         {'name':'FILESYSTEM_MAX_RENAME_COUNT', 'value':filesystem_serving_settings.MAX_RENAME_COUNT},
-        {'name':'FILESYSTEM_INDEXING_AVAILABLE_INDEXING_FUNCTIONS', 'value':filesystem_serving_settings.AVAILABLE_INDEXING_FUNCTIONS},
 
         # Common
         {'name':'COMMON_TEMPORARY_DIRECTORY',