Fix pagination results

[jonathonherbert]

What does this change?

Adds a test and a fix for the odd pagination results patched in #470.

Not quite sure what was causing the original discrepancy, but we were running two queries, one for the data, and one for the count, which made the inconsistency possible.

This PR moves the count columns into the original query, which should remove that inconsistency.

How to test

• The automated tests should pass.
• Running locally or in CODE, use the search bar and observe the paginationresults given back by the API. They should match the data returned.

[jonathonherbert]

@Fweddi great suggestion, done in 67aaf1f and pagination looks good.

[prout-bot]

Seen on Rule Manager (merged by @jonathonherbert 9 minutes and 33 seconds ago) Please check your changes!

[prout-bot]

Overdue on Checker (merged by @jonathonherbert 15 minutes and 3 seconds ago) What's gone wrong?