Move mac_address to correct place to restore alphabetical sorting