Added incremental search etc