diff --git a/lib/galaxy/tools/search/__init__.py b/lib/galaxy/tools/search/__init__.py
index 34297960523..53135bc9cdb 100644
--- a/lib/galaxy/tools/search/__init__.py
+++ b/lib/galaxy/tools/search/__init__.py
@@ -166,11 +166,11 @@ class LazyToolboxSearch(ToolBoxSearch):
             ToolWhooshIndex,
         )
 
-        index_dir = whoosh_dir_for_store(getattr(config, "tool_search_index_dir", None), DEFAULT_STORE_NAME)
+        index_dir = whoosh_dir_for_store(config.tool_search_index_dir, DEFAULT_STORE_NAME)
         if index_dir is None:
             return []
         searcher = ToolWhooshIndex(index_dir=index_dir, tuning=ToolSearchTuning.from_config(config))
-        return searcher.search(q, limit=int(getattr(config, "tool_search_limit", 20)))
+        return searcher.search(q, limit=int(config.tool_search_limit))
 
 
 class ToolPanelViewSearch:
diff --git a/packages/app/src/galaxy/tool_source_store b/packages/app/src/galaxy/tool_source_store
new file mode 120000
index 00000000000..8e71e49263b
--- /dev/null
+++ b/packages/app/src/galaxy/tool_source_store
@@ -0,0 +1 @@
+../../../../lib/galaxy/tool_source_store
\ No newline at end of file