more bool query fixes. hopefully this will do it,
but still can do some optimizations for speed.