Reformatted, added EntryId to tags table