removed esr17 queries