[beeswax] Saved query are renamed to None