Re-add support for namespace tag, erroneously removed.