Change to rc4, fixed up potential race & cleaning up properly when multiple instances of app query is run.