Fix match highlight