Almost working query watching