Highlight/Unhighlight should be called max once in a row

[stropitek]

Sometimes it is difficult to make sure highlight or unhighlight is called only once in a row per key. Maybe the highlight repository should manage that to avoid calling callbacks unnecessarily.