Refactor product catalog
Fix deep linking on controller