Adding two fields to filter by and adding an exception on unknown parameters