Added mappings for QuerySubtypes and QuerySubtypesImprecise.