Fix for non CMS pages