Hotfix/content settings