Keep query keys consistent (#29855)

public/app/features/explore/state/query.ts

@@ -551,13 +551,11 @@ export const queryReducer = (state: ExploreItemState, action: AnyAction): Explor
       nextQueries.push(generateNewKeyAndAddRefIdIfMissing(query, nextQueries, i));
       nextQueries.push(generateNewKeyAndAddRefIdIfMissing(query, nextQueries, i));
     });
     });
 
 
-    const nextQueryKeys: string[] = nextQueries.map(query => query.key!);
-
     return {
     return {
       ...state,
       ...state,
       queries: nextQueries,
       queries: nextQueries,
       logsHighlighterExpressions: undefined,
       logsHighlighterExpressions: undefined,
-      queryKeys: nextQueryKeys,
+      queryKeys: getQueryKeys(nextQueries, state.datasourceInstance),
     };
     };
   }
   }