Changes in measurement update. nf -> rf&nrf in mu and hmu