Wysiwyg editor seems to work as expected with these changes