Remove paginator if there are no results
Merge remote-tracking branch 'origin/master'