added highlighting and history search