Added increment and highlight search.