#212 Fix search results
Merge branch 'version2.0' into version2.1