Add options completer
Handle empty shell line