Adding user filters

Also refactored the previous filters.