NXP-14009: delete by query use path index instead of prefix
NXP-14007: cosmetic
NXP-14012: Handle the subtypes when specifying types in the FROM clause