Fixing key bug and changing names to tag