More support for missing tag data