multiple fixes to products functionality