Improved oid normalization