Fixed pager button urls on pages that contain query params in url
Fixed pager range min/max calculations
Merge remote-tracking branch 'origin/master'