Fix and improve auto-fill locator.