Fix Ui bug when too many allowed values
Merge branch 'fixUiTooManyAllowedValues'