Adds further fixes to product filter, fixes ticket DT-961