Merge of Mr0grog-paged-search-results into master <3 <3 <3