more bool query fixes