Filter fields are now optional, will be ignored if not predent