Entity subtype matching