Fixing active tag to be tag_name rather than name for key