non-3069 county fix
help pagination resets
Merge remote-tracking branch 'upstream/master'
Merge pull request #269 from jpecht/master

non-3069 county fix / help pagination resets