Finish toggle group and fix select when model is null