FIX for issue 963, Add html_safe and fix spelling errors