Fixed : Note is getting added to every highlight -