some changes for highlight search