Case 2796 - Modified calls to entity.
Case 2796 - Code review.
Merge branch 'case-2796' into new-search

* case-2796:
  Case 2796 - Code review.
  Case 2796 - Modified calls to entity.
Case 2882 - Fixed issues when no images to download.
Merge branch 'case-2882' into new-search

* case-2882:
  Case 2882 - Fixed issues when no images to download.
Merge branch 'new-search' into develop