fixed double search issue and using timeout helper