added filtering by user name