Be able to filter by user as well

WIP leftover — removed