added filtering for user fields