Added 'no-option-text' for combo-box
Performance enhancements for large information sets.