Fix tags and Bug 1158

No match.