CMDB archive - minor improvements