Hotfix/category listing