and restore strange custom unit multi unit mode
to these metricfields

Change-Id: I7e228f6fd658374e3f1588c757ef2ed1e6ba78c8