Fix identifier and quote only keys that must be