diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index f92144c2d..f49fd755f 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -168,14 +168,15 @@ firmCountDefaultReroutes :: E.SqlExpr (Entity Company) -> E.SqlExpr (E.Value Wor
 firmCountDefaultReroutes = E.subSelectCount . fromUserCompany (Just (\uc -> uc E.^. UserCompanySupervisor E.&&. uc E.^. UserCompanySupervisorReroute))
 
 firmCountEmployeeSupervised :: E.SqlExpr (Entity Company) -> E.SqlExpr (E.Value Word64)
-firmCountEmployeeSupervised = E.subSelectCount . fromUserCompany $ Just fltr
-  where 
+firmCountEmployeeSupervised = E.subSelectCount . fromUserCompany (Just fltr)
+  where
+    fltr :: E.SqlExpr (Entity UserCompany) -> E.SqlExpr (E.Value Bool)
     fltr usrc = E.exists $ do
       usrSuper <- E.from $ E.table @UserSupervisor
       E.where_ $ usrSuper E.^. UserSupervisorUser E.==. usrc E.^. UserCompanyUser
 
 firmCountEmployeeRerouted :: E.SqlExpr (Entity Company) -> E.SqlExpr (E.Value Word64)
-firmCountEmployeeRerouted = E.subSelectCount . fromUserCompany $ Just fltr
+firmCountEmployeeRerouted = E.subSelectCount . fromUserCompany (Just fltr)
   where 
     fltr usrc = E.exists $ do
       usrSuper <- E.from $ E.table @UserSupervisor
@@ -183,7 +184,7 @@ firmCountEmployeeRerouted = E.subSelectCount . fromUserCompany $ Just fltr
         E.&&.    usrSuper E.^. UserSupervisorRerouteNotifications
 
 firmCountEmployeeRerPost :: E.SqlExpr (Entity Company) -> E.SqlExpr (E.Value Word64)
-firmCountEmployeeRerPost = E.subSelectCount . fromUserCompany $ Just fltr
+firmCountEmployeeRerPost = E.subSelectCount . fromUserCompany (Just fltr)
   where 
     fltr usrc = E.exists $ do
       (usrSuper :& usr) <-