diff --git a/Dockerfile.web b/Dockerfile.web
index 56b126d53..448a7f748 100644
--- a/Dockerfile.web
+++ b/Dockerfile.web
@@ -30,6 +30,7 @@ RUN cd grunt && npm install
 RUN cd grunt && grunt
 
 ADD conf/init/svlogd_config /svlogd_config
+ADD conf/init/doupdatelimits.sh /etc/my_init.d/
 ADD conf/init/preplogsdir.sh /etc/my_init.d/
 ADD conf/init/runmigration.sh /etc/my_init.d/
 
diff --git a/conf/init/doupdatelimits.sh b/conf/init/doupdatelimits.sh
new file mode 100755
index 000000000..603559de0
--- /dev/null
+++ b/conf/init/doupdatelimits.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+set -e
+
+# Update the connection limit
+sysctl -w net.core.somaxconn=1024
\ No newline at end of file
diff --git a/endpoints/index.py b/endpoints/index.py
index bf37e14b5..4017d47e9 100644
--- a/endpoints/index.py
+++ b/endpoints/index.py
@@ -428,7 +428,11 @@ def get_search():
   if user is not None:
     username = user.username
 
-  matching = model.get_matching_repositories(query, username)
+  if query:
+    matching = model.get_matching_repositories(query, username)
+  else:
+    matching = []
+
   results = [result_view(repo) for repo in matching
              if (repo.visibility.name == 'public' or 
                  ReadRepositoryPermission(repo.namespace, repo.name).can())]
diff --git a/test/specs.py b/test/specs.py
index 33db0493e..8749a025e 100644
--- a/test/specs.py
+++ b/test/specs.py
@@ -196,7 +196,7 @@ def build_index_specs():
     IndexTestSpec(url_for('index.put_repository_auth', repository=PUBLIC_REPO),
                   NO_REPO, 501, 501, 501, 501).set_method('PUT'),
 
-    IndexTestSpec(url_for('index.get_search'), NO_REPO, 501, 501, 501, 501),
+    IndexTestSpec(url_for('index.get_search'), NO_REPO, 200, 200, 200, 200),
 
     IndexTestSpec(url_for('index.ping'), NO_REPO, 200, 200, 200, 200),