fixes submodel's baseId and queries output