COOPR-503: improve cli according to last comments