LIB001-897: Improvement of search and auto-complete