Minor bugs related to highlights with no tag.