#949 Fix the search feature