Fixed problems with Comment toggling messing up the undo manager.
Selecting further now clears any previous highlighted matches.