Fix #2693 PageCount doesn't work if the query gets constructed with page number as the first query parameter

Fix #2693 PageCount doesn't work if the query gets constructed with page number as the first query parameter #971