Updated AssetLocator to be fully robust and handle shifting indexes