HUE-1926 [beeswax] Cached query should not be replaced by a saved one