Fixes filtering and pagination in users admin
Merge branch 'master' into staging