Improve handling of unknown tags.