fixes #1286
Merge branch 'search-suggestions'