add search highlight removal
fix merge