Fixes in TagPickerForOptions, before merge.