Switch to tag instead of tagNameFormat