[BUGFIX] Fixed select behavior to prevent save error

I already had some logic for this  ..