ADDED support for completion in browser.waitForServer