Update normalize to preserve UID, and update date parsing rules to handle all types.