added some improvements parsing data response