Fixes the index name fetching problem