diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index de7a86d06..1b27ad612 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -272,11 +272,11 @@ mkFirmAllTable isAdmin uid = do
           , singletonMap "avsnr"          $ SortColumn (E.^. CompanyAvsId)
           , singletonMap "postal-pref"    $ SortColumn (E.^. CompanyPrefersPostal)
           , singletonMap "users"          $ SortColumn firmCountUsers
-          , singletonMap "supervisors"    $ SortColumn firmCountSupervisors
+          , singletonMap "supervisors"    $ SortColumn firmHasSupervisors
           -- , singletonMap "emp-supervised" $ SortColumn firmCountEmployeeSupervised
           -- , singletonMap "emp-rerouted"   $ SortColumn firmCountEmployeeRerouted
           -- , singletonMap "emp-rer-post"   $ SortColumn firmCountEmployeeRerPost
-          , singletonMap "reroute-def"    $ SortColumn firmCountDefaultReroutes
+          , singletonMap "reroute-def"    $ SortColumn firmHasDefaultReroutes
           -- , singletonMap "foreigners"     $ SortColumn firmCountForeignSupervisors
           -- , singletonMap "reroute-act"    $ SortColumn firmCountActiveReroutes
           -- , singletonMap "reroute-all"    $ SortColumn firmCountActiveReroutes'