Passes user_role_id to filter
Refactors user filter
Refactors user filter and views to work with refactored filter