KNIFE-450: Fixed issues with the option --returns