Fixed some of the issues with ProductCatalogue
merge fixes