Added ability to filter by tags and by username