Re-added cleaning for html chars