issue #653: slow query