Change QueryKey for QueryId