Add ckeditor, minor adjustments to queries