Improve highlighting candidate