Add filtering on value
Added remapping of json object