added product filter event handler; cleanup