tag/index and key/edit fix
Merge pull request #37 from canerc/master

tag/index and key/edit fix