[STUD-406] Fix/cdodge/unescape quote strings