added tab control and search highlight