BS-11577 - return Json object instead of List.toString