Improve :rows solr paramaeter mapping, and ensure pagination works even ...

...if the row parameter isn't set elsewhere