added fix for removing null values from json response