Fix json response and add lists