Added filtering of users