small fix for selecton but save and cancel still make problems