More metadata adjustments to NRCan XPath