Be able to filter by user as well

missing break?