Fix escaping of tags
Release 1.6.13