Case 2796 - Fixed page numbers.
Case 2796 - Fixed "non-object" error.
Merge remote-tracking branch 'origin/case-2796' into new-search

* origin/case-2796:
  Case 2796 - Fixed "non-object" error.
  Case 2796 - Fixed page numbers.