#82 Updated boolean query to support options on the outer block