fix history search, add highlight