let's check if the API result data has structure it's suppose to has
renamed one method so its name is more descriptive
Merge branch 'code-review-for-dev-branch-2nd-round' into DAR-1064