[AESH-111]
small fixes for option completion