Minor changes to run entire process from query screen