Rebase fix
Support PromiseEmitters, add search bookmark tests, fix premature firing of promise resolution