still poking at query bugs :-(