CNS-534, CNS-560: Fix redactor copy-paste problems