Amount of results for 'reset link' is calculated incorrectly

Rolling patch from #6 to v2

Note: this does not address the comments from #7

Re-rolling patch from #8 for 2.0.x, using event handler as specified in #7.

Sorry, last patch was empty. Re-uploading.

The same issue is there when using the database as the backend of our server, instead of Solr.

Seems like large enough change that will need test coverage.