Added Filtering for users