Added a product filter.
Minor fixes