Adding improved incremental search.