Speed things up with an explicit bbox check followed by the buffer query