Highlight matches better