diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index 596ea40c9..5067c38ed 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -599,7 +599,7 @@ mkFirmAllTable isAdmin uid = do
               case criterion of
                 Nothing -> return True :: DB Bool
                 (Just (crit::Text)) -> do
-                  critFirms <- memcachedBy (Just . Right $ 5 * diffMinute) ("svr:"<>crit) $ fmap (Set.fromAscList . fmap E.unValue) $ E.select $ E.distinct $ do
+                  critFirms <- memcachedBy (Just . Right $ 1 * diffMinute) ("SVR:"<>crit) $ fmap (Set.fromList . fmap E.unValue) $ E.select $ E.distinct $ do
                     (usr :& cmp) <- E.from  $ E.table @User `E.innerJoin` E.table @Company
                       `E.on` (\(usr :& cmp) -> E.exists (do
                         usrCmp <- E.from $ E.table @UserCompany
@@ -612,13 +612,13 @@ mkFirmAllTable isAdmin uid = do
                           E.&&. E.exists (do
                             usrSub <- E.from $ E.table @UserCompany
                             E.where_ $ usrSub E.^. UserCompanyUser    E.==. usrSpr E.^. UserSupervisorUser
-                                E.&&.  usrSub E.^. UserCompanyCompany E.==. cmp E.^. CompanyId
+                                E.&&.  usrSub E.^. UserCompanyCompany E.==. cmp    E.^. CompanyId
                           )
                       ))
-                    E.where_ $ (usr E.^. UserDisplayName  `E.hasInfix` E.val crit)
+                    E.where_ $ (usr E.^. UserDisplayName  `E.hasInfix` E.val        crit )
                         E.||.  (usr E.^. UserDisplayEmail `E.hasInfix` E.val (CI.mk crit))
-                        E.||.  (usr E.^. UserSurname      `E.hasInfix` E.val crit)
-                    E.orderBy [E.asc $ cmp E.^. CompanyId]
+                        E.||.  (usr E.^. UserSurname      `E.hasInfix` E.val        crit )
+                    -- E.orderBy [E.asc $ cmp E.^. CompanyId]
                     return $ cmp E.^. CompanyId
                   let cid = dbr ^. resultAllCompanyEntity . _entityKey
                   return $ Set.member cid critFirms