Convert queries to lean, mapped (and pruned) for regions endpoints