now that we hint the query decomposition to only decompse the tiers that are filled we can easily include all tiers on both indices as the defaults.