added admin and correct user filters to user