Fix search context bug, fix cache timing behavior
Make Events complete unless otherwise specified, misc cleanup
Avoid ValueError on shutdown