Minor fixes.
Tag highlighting UI ready.