Few adjustments in json parsing