added better search highlight scheme