fix-optimized-search-function