Make wait true by default in locator controller