Disable query on exit.  Close #40