Fix for escaping of <> characters