diff --git a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
index 0be4ae2a..a2de28e3 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
@@ -29,6 +29,7 @@ type alias Model =
     , formError : Maybe String
     , loading : Bool
     , deleteConfirm : Comp.YesNoDimmer.Model
+    , query : String
     }
 
 
@@ -45,6 +46,7 @@ emptyModel =
     , formError = Nothing
     , loading = False
     , deleteConfirm = Comp.YesNoDimmer.emptyModel
+    , query = ""
     }
 
 
@@ -188,7 +190,11 @@ update flags msg model =
             ( { model | deleteConfirm = cm }, cmd )
 
         SetQuery str ->
-            ( model, Api.getEquipments flags str EquipmentResp )
+            let
+                m =
+                    { model | query = str }
+            in
+            ( m, Api.getEquipments flags str EquipmentResp )
 
 
 view : Model -> Html Msg
@@ -210,6 +216,7 @@ viewTable model =
                         [ input
                             [ type_ "text"
                             , onInput SetQuery
+                            , value model.query
                             , placeholder "Search…"
                             ]
                             []
diff --git a/modules/webapp/src/main/elm/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Comp/OrgManage.elm
index 4e36c0f8..e79fecde 100644
--- a/modules/webapp/src/main/elm/Comp/OrgManage.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgManage.elm
@@ -29,6 +29,7 @@ type alias Model =
     , formError : Maybe String
     , loading : Bool
     , deleteConfirm : Comp.YesNoDimmer.Model
+    , query : String
     }
 
 
@@ -45,6 +46,7 @@ emptyModel =
     , formError = Nothing
     , loading = False
     , deleteConfirm = Comp.YesNoDimmer.emptyModel
+    , query = ""
     }
 
 
@@ -102,7 +104,7 @@ update flags msg model =
             ( { model | formModel = m2 }, Cmd.map FormMsg c2 )
 
         LoadOrgs ->
-            ( { model | loading = True }, Api.getOrganizations flags "" OrgResp )
+            ( { model | loading = True }, Api.getOrganizations flags model.query OrgResp )
 
         OrgResp (Ok orgs) ->
             let
@@ -188,7 +190,11 @@ update flags msg model =
             ( { model | deleteConfirm = cm }, cmd )
 
         SetQuery str ->
-            ( model, Api.getOrganizations flags str OrgResp )
+            let
+                m =
+                    { model | query = str }
+            in
+            ( m, Api.getOrganizations flags str OrgResp )
 
 
 view : Model -> Html Msg
@@ -210,6 +216,7 @@ viewTable model =
                         [ input
                             [ type_ "text"
                             , onInput SetQuery
+                            , value model.query
                             , placeholder "Search…"
                             ]
                             []
diff --git a/modules/webapp/src/main/elm/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Comp/PersonManage.elm
index a8af54c9..728932a8 100644
--- a/modules/webapp/src/main/elm/Comp/PersonManage.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonManage.elm
@@ -29,6 +29,7 @@ type alias Model =
     , formError : Maybe String
     , loading : Bool
     , deleteConfirm : Comp.YesNoDimmer.Model
+    , query : String
     }
 
 
@@ -45,6 +46,7 @@ emptyModel =
     , formError = Nothing
     , loading = False
     , deleteConfirm = Comp.YesNoDimmer.emptyModel
+    , query = ""
     }
 
 
@@ -102,7 +104,7 @@ update flags msg model =
             ( { model | formModel = m2 }, Cmd.map FormMsg c2 )
 
         LoadPersons ->
-            ( { model | loading = True }, Api.getPersons flags "" PersonResp )
+            ( { model | loading = True }, Api.getPersons flags model.query PersonResp )
 
         PersonResp (Ok orgs) ->
             let
@@ -188,7 +190,11 @@ update flags msg model =
             ( { model | deleteConfirm = cm }, cmd )
 
         SetQuery str ->
-            ( model, Api.getPersons flags str PersonResp )
+            let
+                m =
+                    { model | query = str }
+            in
+            ( m, Api.getPersons flags str PersonResp )
 
 
 view : Model -> Html Msg
@@ -210,6 +216,7 @@ viewTable model =
                         [ input
                             [ type_ "text"
                             , onInput SetQuery
+                            , value model.query
                             , placeholder "Search…"
                             ]
                             []
diff --git a/modules/webapp/src/main/elm/Comp/TagManage.elm b/modules/webapp/src/main/elm/Comp/TagManage.elm
index dfff532a..8cc661a9 100644
--- a/modules/webapp/src/main/elm/Comp/TagManage.elm
+++ b/modules/webapp/src/main/elm/Comp/TagManage.elm
@@ -29,6 +29,7 @@ type alias Model =
     , formError : Maybe String
     , loading : Bool
     , deleteConfirm : Comp.YesNoDimmer.Model
+    , query : String
     }
 
 
@@ -45,6 +46,7 @@ emptyModel =
     , formError = Nothing
     , loading = False
     , deleteConfirm = Comp.YesNoDimmer.emptyModel
+    , query = ""
     }
 
 
@@ -102,7 +104,7 @@ update flags msg model =
             ( { model | tagFormModel = m2 }, Cmd.map FormMsg c2 )
 
         LoadTags ->
-            ( { model | loading = True }, Api.getTags flags "" TagResp )
+            ( { model | loading = True }, Api.getTags flags model.query TagResp )
 
         TagResp (Ok tags) ->
             let
@@ -188,7 +190,11 @@ update flags msg model =
             ( { model | deleteConfirm = cm }, cmd )
 
         SetQuery str ->
-            ( model, Api.getTags flags str TagResp )
+            let
+                m =
+                    { model | query = str }
+            in
+            ( m, Api.getTags flags str TagResp )
 
 
 view : Model -> Html Msg
@@ -210,6 +216,7 @@ viewTable model =
                         [ input
                             [ type_ "text"
                             , onInput SetQuery
+                            , value model.query
                             , placeholder "Search…"
                             ]
                             []