added ability to filter by user