Add filtering by user_group