[OE-4000] Add new fields and make dates fuzzy.