Fixed json data issues