case 2785 - Fix total page count.
Merge branch 'case-2785' into new-search

* case-2785:
  case 2785 - Fix total page count.