Fixes for viewcategory and viewproduct with the new behaviour