Form tweaks to remove html chars