Product list fixes