Fix rebase errors with product sorting

I forgot to fix an error with conflicting code for the product sort. This
fixes it.(Note: we may want to put a clearfilter() function in if the
products dropdown is set to "Please Choose a Product".)