Even though this already exists, in this task we need to extend this to cover filtering by more fields