Proper location mapping in index