A serious code re-factoring.
Fixed: invalid on-fly sorting in Locator.