Update to convert {<<Id:96>>} to Id for JSON compability