LIB001-897: Improvement of search and auto-complete
Merge pull request #218 from ianthe/LIB001-897

LIB001-897: Improvement of search and auto-complete