fix entry, entryname, tagEntry, etc