better option handling
should autocomplete correct option name