Re-added .queryUntil() as some legacy app are failing for now