fixed some mappings. Fixed syntax error when processing as json string