Fixed a number of issues with the new user filters