Bug Fix:   Older entries may not contain correct/incorrect info so appear as different keys.