CMS Categories fixes