Updated filtering options to be more descriptive (rather than just and/or)