CFY-661 fixed swagger return types