Adding support for cartographics
Removing double-escaping from spec