Replaces some choices with ref to m.dates