HSEARCH-703 Enabling queries for unindexed types with indexed sub-types