Fixing double escape_string see BT#7002