Correctly update the number of pages from the results list - covers all filter and search cases

Change-Id: I72055b8e8b2d0d640379da0f6a3106e82366057d