#1152 - Fix an issue where html entities were still being encoded with unicode when saved into the database