Merge pull request #265 from ybenjo/fix-search-result-size-bug