tag/index and key/edit fix