Properly drain dumb Query