Little code cleanup
BugFix: EditTag inserting tag with wrong ID fixed