Added leader and no highlight search and search and replace