Handle dataset query key appropriately