more bool query fixes.