moved empty query control