Added query_subtypes.