Fixed completion of option names