Fix issues in helm-org. get rid of use of -flatten.