setted search hilighting
merged master