[BUGFIX] Fixed select behavior to prevent save error