Select bookmarks in search menu

modules/webapp/src/main/elm/Data/ItemQuery.elm

@@ -71,7 +71,7 @@ and list =
             Nothing
 
         es ->
-            Just (And es)
+            Just (unwrap (And es))
 
 
 request : SearchMode -> Maybe ItemQuery -> RQ.ItemQuery
@@ -90,6 +90,32 @@ renderMaybe mq =
         |> Maybe.withDefault ""
 
 
+unwrap : ItemQuery -> ItemQuery
+unwrap query =
+    case query of
+        And inner ->
+            case inner of
+                first :: [] ->
+                    unwrap first
+
+                _ ->
+                    And (List.map unwrap inner)
+
+        Or inner ->
+            case inner of
+                first :: [] ->
+                    unwrap first
+
+                _ ->
+                    Or (List.map unwrap inner)
+
+        Not (Not inner) ->
+            unwrap inner
+
+        _ ->
+            query
+
+
 render : ItemQuery -> String
 render q =
     let
@@ -118,7 +144,7 @@ render q =
             String.replace "\"" "\\\""
                 >> surround "\""
     in
-    case q of
+    case unwrap q of
         And inner ->
             List.map render inner
                 |> String.join " "