improved handling of index locator