concerned that this breaks all queries without a dependent relationship because they don't get into this map? do you need to combined subParsesByCountry and augmentedSubParsesByCountry?