Fix tagopt not saved if clicking OK/Apply directly instead of "Add New/Save"