Always check query loop necessity

cbugg:  close bug-963
closes #44