Changed the returned json object and how front end utilizes the new object format


EV-527