some fixes with parsing response body