more righteous fixes for bool queries