Try changes to safe-html stuff