Updated DataQuery\Toggle, can override toggle value