I agree a distinguishing tag would be useful. Top-level 30040s *should* have no e tags, but they definitely *must* have the top-level tag.