fixing json parsing issues for results returned
Merge remote-tracking branch 'origin/master'