fixed race condition fix; added ability to load waiting page directly