Highlight search query better