fixed json mappings