Administrator filters
Merge branch 'hotfix/admin_view_all'