Fix for incremental search