diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex
index 873f55f15..6ce5be6e7 100644
--- a/app/lib/meadow/search/index.ex
+++ b/app/lib/meadow/search/index.ex
@@ -57,8 +57,19 @@ defmodule Meadow.Search.Index do
           "filter_query" => %{
             "description" => "Restricts requests to publicly visible documents",
             "query" => %{
-              "terms" => %{
-                "visibility" => ["public", "authenticated"]
+              "bool" => %{
+                "must" => [
+                  %{
+                    "terms" => %{
+                      "visibility" => ["Public", "Institution"]
+                    }
+                  },
+                  %{
+                    "term" => %{
+                      "published" => true
+                    }
+                  }
+                ]
               }
             }
           }