[Yujun] Modified SelectLocator.