v2.1.1

scientific notation for MICs
Fixes #123
2025-07-10 23:41:51 +02:00 · 2023-10-22 15:51:27 +02:00 · 2023-10-20 15:45:00 +02:00 · 2023-10-20 15:07:11 +02:00 · 2023-10-20 14:51:48 +02:00 · 2023-07-20 08:24:27 +02:00
249 changed files with 54864 additions and 34935 deletions
--- a/.Rbuildignore
+++ b/.Rbuildignore
@ -30,9 +30,9 @@
 ^vignettes/datasets\.Rmd$
 ^vignettes/EUCAST\.Rmd$
 ^vignettes/MDR\.Rmd$
+^vignettes/other_pkg.*\.Rmd$
 ^vignettes/PCA\.Rmd$
 ^vignettes/resistance_predict\.Rmd$
-^vignettes/SPSS\.Rmd$
 ^vignettes/WHONET\.Rmd$
 ^logo.svg$
 ^CRAN-SUBMISSION$
--- a/.github/prehooks/pre-commit
+++ b/.github/prehooks/pre-commit
@ -1,17 +1,17 @@
 #!/bin/sh

 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -69,16 +69,10 @@ if [ "$currenttag" = "" ]; then
 else
  # there is a tag, so base version number on that
  currentcommit=$(git rev-list --count ${currenttagfull}..${defaultbranch})
-  if (( "$currentcommit" == 0 )); then
-    # tag is new, so this must become the version number
-    currentversion="$currenttag"
-  fi
  echo "- latest tag is '${currenttagfull}', with ${currentcommit} previous commits in '${defaultbranch}'"
 fi
-if [ "$currentversion" = "" ]; then
-  # combine tag (e.g. 1.2.3) and commit number (like 5) increased by 9000 to indicate beta version
-  currentversion="$currenttag.$((currentcommit + 9001))" # results in e.g. 1.2.3.9005
-fi
+# combine tag (e.g. 1.2.3) and commit number (like 5) increased by 9000 to indicate beta version
+currentversion="$currenttag.$((currentcommit + 9001))" # results in e.g. 1.2.3.9005
 echo "- ${currentpkg} pkg version set to ${currentversion}"

 # set version number and date to DESCRIPTION file
--- a/.github/workflows/check-old.yaml
+++ b/.github/workflows/check-old.yaml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -48,7 +48,8 @@ jobs:
        config:
          # Test all old versions of R >= 3.0, we support them all!
          # For these old versions, dependencies and vignettes will not be checked.
-          # For recent R versions, see check-recent.yaml (r-lib and tidyverse support the latest 5 major R versions).
+          # For recent R versions, see check-recent.yaml (r-lib and tidyverse support the latest 5 major R releases).
+          # - {os: windows-latest, r: '3.5', allowfail: true} # always fails, horrible with UTF-8
          - {os: ubuntu-latest, r: '3.4', allowfail: false}
          - {os: ubuntu-latest, r: '3.3', allowfail: false}
          - {os: ubuntu-latest, r: '3.2', allowfail: false}
--- a/.github/workflows/check-recent.yaml
+++ b/.github/workflows/check-recent.yaml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -52,21 +52,21 @@ jobs:
      fail-fast: false
      matrix:
        config:
-          # current development version:
+          # current development version, check all major OSes:
          - {os: macOS-latest,   r: 'devel', allowfail: false}
          - {os: windows-latest, r: 'devel', allowfail: false}
          - {os: ubuntu-latest,  r: 'devel', allowfail: false}

-          # current 'release' version:
-          - {os: macOS-latest,   r: '4.2', allowfail: false}
-          - {os: windows-latest, r: '4.2', allowfail: false}
-          - {os: ubuntu-latest,  r: '4.2', allowfail: false}
+          # current 'release' version, check all major OSes:
+          - {os: macOS-latest,   r: '4.3', allowfail: false}
+          - {os: windows-latest, r: '4.3', allowfail: false}
+          - {os: ubuntu-latest,  r: '4.3', allowfail: false}

          # older versions (see also check-old.yaml for even older versions):
+          - {os: ubuntu-latest, r: '4.2', allowfail: false}
          - {os: ubuntu-latest, r: '4.1', allowfail: false}
          - {os: ubuntu-latest, r: '4.0', allowfail: false}
-          - {os: ubuntu-latest, r: '3.6', allowfail: false}
-          - {os: ubuntu-latest, r: '3.5', allowfail: false} # when a new R releases, this one has to move to check-old.yaml
+          - {os: ubuntu-latest, r: '3.6', allowfail: false} # when a new R releases, this one has to move to check-old.yaml

    env:
      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/codecovr.yaml
+++ b/.github/workflows/codecovr.yaml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/.github/workflows/lintr.yaml
+++ b/.github/workflows/lintr.yaml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/.github/workflows/website.yaml
+++ b/.github/workflows/website.yaml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -65,7 +65,11 @@ jobs:
      - name: Set up R dependencies
        uses: r-lib/actions/setup-r-dependencies@v2
        with:
-          extra-packages: any::pkgdown
+          # add extra packages for website articles:
+          extra-packages: |
+            any::pkgdown
+            any::tidymodels
+            any::data.table

      # Send updates to repo using GH Actions bot
      - name: Create website in separate branch
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-Version: 2.0.0
-Date: 2023-03-12 12:42:08 UTC
-SHA: 80cfc503c29ad48806e526b97d4570600bbd5420
+Version: 2.1.1
+Date: 2023-10-20 16:05:16 UTC
+SHA: ca72a646d041f7f096c4e196e8ae2fb2b176019c
--- a/7
+++ b/7
@ -1,12 +1,12 @@
 Package: AMR
-Version: 2.0.0.9015
-Date: 2023-05-12
+Version: 2.1.1
+Date: 2023-10-20
 Title: Antimicrobial Resistance Data Analysis
 Description: Functions to simplify and standardise antimicrobial resistance (AMR)
  data analysis and to work with microbial and antimicrobial properties by
  using evidence-based methods, as described in <doi:10.18637/jss.v104.i03>.
 Authors@R: c(
-  person(family = "Berends",     c("Matthijs", "S."), role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7620-1800"), email = "m.berends@certe.nl"),
+  person(family = "Berends",     c("Matthijs", "S."), role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7620-1800"), email = "m.s.berends@umcg.nl"),
  person(family = "Luz",         c("Christian", "F."), role = c("aut", "ctb"), comment = c(ORCID = "0000-0001-5809-5995")),
  person(family = "Souverein",   c("Dennis"), role = c("aut", "ctb"), comment = c(ORCID = "0000-0003-0455-0336")),
  person(family = "Hassing",     c("Erwin", "E.", "A."), role = c("aut", "ctb")),
@ -38,6 +38,7 @@ Enhances:
  tidyselect,
  tsibble
 Suggests: 
+  cli,
  curl,
  data.table,
  dplyr,
--- a/64
+++ b/64
@ -1,22 +1,8 @@
 # Generated by roxygen2: do not edit by hand

-S3method("!",mic)
 S3method("!=",ab_selector)
-S3method("!=",mic)
-S3method("%%",mic)
-S3method("%/%",mic)
 S3method("&",ab_selector)
-S3method("&",mic)
-S3method("*",mic)
-S3method("+",mic)
-S3method("-",mic)
-S3method("/",mic)
-S3method("<",mic)
-S3method("<=",mic)
 S3method("==",ab_selector)
-S3method("==",mic)
-S3method(">",mic)
-S3method(">=",mic)
 S3method("[",ab)
 S3method("[",av)
 S3method("[",disk)
@ -41,18 +27,15 @@ S3method("[[<-",mic)
 S3method("[[<-",mo)
 S3method("[[<-",rsi)
 S3method("[[<-",sir)
-S3method("^",mic)
 S3method("|",ab_selector)
-S3method("|",mic)
-S3method(abs,mic)
-S3method(acos,mic)
-S3method(acosh,mic)
+S3method(Complex,mic)
+S3method(Math,mic)
+S3method(Ops,mic)
+S3method(Summary,mic)
 S3method(all,ab_selector)
 S3method(all,ab_selector_any_all)
-S3method(all,mic)
 S3method(any,ab_selector)
 S3method(any,ab_selector_any_all)
-S3method(any,mic)
 S3method(as.data.frame,ab)
 S3method(as.data.frame,av)
 S3method(as.data.frame,mo)
@ -69,10 +52,6 @@ S3method(as.sir,data.frame)
 S3method(as.sir,default)
 S3method(as.sir,disk)
 S3method(as.sir,mic)
-S3method(asin,mic)
-S3method(asinh,mic)
-S3method(atan,mic)
-S3method(atanh,mic)
 S3method(barplot,antibiogram)
 S3method(barplot,disk)
 S3method(barplot,mic)
@ -88,34 +67,15 @@ S3method(c,mic)
 S3method(c,mo)
 S3method(c,rsi)
 S3method(c,sir)
-S3method(ceiling,mic)
 S3method(close,progress_bar)
-S3method(cos,mic)
-S3method(cosh,mic)
-S3method(cospi,mic)
-S3method(cummax,mic)
-S3method(cummin,mic)
-S3method(cumprod,mic)
-S3method(cumsum,mic)
-S3method(digamma,mic)
 S3method(droplevels,mic)
 S3method(droplevels,rsi)
 S3method(droplevels,sir)
-S3method(exp,mic)
-S3method(expm1,mic)
-S3method(floor,mic)
 S3method(format,bug_drug_combinations)
-S3method(gamma,mic)
 S3method(hist,mic)
 S3method(kurtosis,data.frame)
 S3method(kurtosis,default)
 S3method(kurtosis,matrix)
-S3method(lgamma,mic)
-S3method(log,mic)
-S3method(log10,mic)
-S3method(log1p,mic)
-S3method(log2,mic)
-S3method(max,mic)
 S3method(mean,mic)
 S3method(mean_amr_distance,data.frame)
 S3method(mean_amr_distance,default)
@ -123,7 +83,6 @@ S3method(mean_amr_distance,disk)
 S3method(mean_amr_distance,mic)
 S3method(mean_amr_distance,sir)
 S3method(median,mic)
-S3method(min,mic)
 S3method(plot,antibiogram)
 S3method(plot,disk)
 S3method(plot,mic)
@ -143,9 +102,7 @@ S3method(print,mo_uncertainties)
 S3method(print,pca)
 S3method(print,rsi)
 S3method(print,sir)
-S3method(prod,mic)
 S3method(quantile,mic)
-S3method(range,mic)
 S3method(rep,ab)
 S3method(rep,av)
 S3method(rep,disk)
@ -153,28 +110,15 @@ S3method(rep,mic)
 S3method(rep,mo)
 S3method(rep,rsi)
 S3method(rep,sir)
-S3method(round,mic)
-S3method(sign,mic)
-S3method(signif,mic)
-S3method(sin,mic)
-S3method(sinh,mic)
-S3method(sinpi,mic)
 S3method(skewness,data.frame)
 S3method(skewness,default)
 S3method(skewness,matrix)
 S3method(sort,mic)
-S3method(sqrt,mic)
-S3method(sum,mic)
 S3method(summary,mic)
 S3method(summary,mo)
 S3method(summary,pca)
 S3method(summary,rsi)
 S3method(summary,sir)
-S3method(tan,mic)
-S3method(tanh,mic)
-S3method(tanpi,mic)
-S3method(trigamma,mic)
-S3method(trunc,mic)
 S3method(unique,ab)
 S3method(unique,av)
 S3method(unique,disk)
--- a/NEWS.md
+++ b/NEWS.md
@ -1,16 +1,50 @@
-# AMR 2.0.0.9015
+# AMR 2.1.1
+
+* Fix for selecting first isolates using the phenotype-based method
+  * This included too many isolates when patients had altering antibiograms within the same bacterial species
+  * See for more info [our issue #122](https://github.com/msberends/AMR/issues/122)
+* Added 1,366 LOINC codes to the `antibiotics` data set and updated to the latest version (LOINC v2.76)
+* MICs can now be used in complex number calculations and allow scientific number format as input (e.g., `as.mic("1.28e-2")`)
+* Fix rounding MICs on latest R beta ('R-devel')
+* Removed unneeded note about the used language when option `AMR_locale` is set
+* Fixed non-ASCII characters in documentation, according to CRAN maintainers
+
+
+# AMR 2.1.0
+
+## New
+* Regarding clinical breakpoints:
+  * Clinical breakpoints and intrinsic resistance of EUCAST 2023 and CLSI 2023 have been added to the `clinical_breakpoints` data set for usage in `as.sir()`. EUCAST 2023 (v13.0) is now the new default guideline for all MIC and disks diffusion interpretations
+  * The EUCAST dosage guideline of v13.0 has been added to the `dosage` data set
+  * The `clinical_breakpoints` data set now also contains epidemiological cut-off (ECOFF) values and CLSI animal breakpoints. These two new breakpoint types can be used for MIC/disk interpretation using `as.sir(..., breakpoint_type = "ECOFF")` or`as.sir(..., breakpoint_type = "animal")`, which is an important new addition for veterinary microbiology.
+* Added support for 30 species groups / complexes. They are gathered in a new data set `microorganisms.groups` and are used in clinical breakpoint interpretation. For example, CLSI 2023 contains breakpoints for the RGM group (Rapidly Growing Mycobacterium, containing over 80 species) which is now supported by our package.
+* Added oxygen tolerance from BacDive to over 25,000 bacteria in the `microorganisms` data set
+  * Added `mo_oxygen_tolerance()` to retrieve the values
+  * Added `mo_is_anaerobic()` to determine which genera/species are obligate anaerobic bacteria
+* Added LPSN and GBIF identifiers, and oxygen tolerance to `mo_info()`
+* Added SAS Transport files (file extension `.xpt`) to [our download page](https://msberends.github.io/AMR/articles/datasets.html) to use in SAS software
+* Added microbial codes for Gram-negative/positive anaerobic bacteria

 ## Changed
-* Added oxygen tolerance to over 25,000 bacteria in the `microorganisms` data set
-  * Added `mo_oxygen_tolerance()` to retrieve the values
-  * Added `mo_is_anaerobic()` to determine which species are obligate anaerobic bacteria
-* Added LPSN and GBIF identifiers, and oxygen tolerance to `mo_info()`
-* formatting fix for `sir_interpretation_history()`
-* Fixed some WHONET codes for microorganisms and consequently a couple of entries in `clinical_breakpoints`
-* Added microbial codes for Gram-negative/positive anaerobic bacteria
+* Updated algorithm of `as.mo()` by giving more weight to fungi
+* Fixed clinical breakpoints errors introduced by the source we import the rules from
 * `mo_rank()` now returns `NA` for 'unknown' microorganisms (`B_ANAER`, `B_ANAER-NEG`, `B_ANAER-POS`, `B_GRAMN`, `B_GRAMP`, `F_FUNGUS`, `F_YEAST`, and `UNKNOWN`)
+* When printing microorganism or antibiotic codes in a tibble, a mouse-hover now shows the full name of the code
+* Plots for MIC and disk diffusion values:
+  * Now have settable arguments for breakpoint type and PK/PD, like `as.sir()`
+  * Will now contain the name of the guideline table in the subtitle of the plot
+* Fixed formatting for `sir_interpretation_history()`
+* Fixed some WHONET codes for microorganisms and consequently a couple of entries in `clinical_breakpoints`
 * Fixed a bug for `as.mo()` that led to coercion of `NA` values when using custom microorganism codes
-* Added SAS Transport files (file extension `.xpt`) to [our download page](https://msberends.github.io/AMR/articles/datasets.html) to use in SAS software
+* Fixed usage of `icu_exclude` in `first_isolates()`
+* Improved `as.mo()` algorithm:
+  * Now allows searching on only species names
+  * Fix for using the `keep_synonyms` argument when using MO codes as input
+  * Fix for using the `minimum_matching_score` argument
+* Updated the code table in `microorganisms.codes`
+* Fixed an endless loop if using `reference_df` in `as.mo()`
+* Fixed bug for indicating UTIs in `as.sir()`
+* Greatly improved speed of `as.sir()`


 # AMR 2.0.0
@ -169,4 +203,4 @@ We now added extensive support for antiviral agents! For the first time, the `AM

 ----

-This changelog only contains changes from AMR v2.0 and later. For prior versions, please see [our archive](https://github.com/msberends/AMR/blob/v1.8.2/NEWS.md).
+This changelog only contains changes from AMR v2.0 (January 2023) and later. For prior versions, please see [our archive](https://github.com/msberends/AMR/blob/v1.8.2/NEWS.md).
--- a/R/aa_amr-package.R
+++ b/R/aa_amr-package.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -34,9 +34,9 @@
 #'
 #' The `AMR` package is a [free and open-source](https://msberends.github.io/AMR/#copyright) R package with [zero dependencies](https://en.wikipedia.org/wiki/Dependency_hell) to simplify the analysis and prediction of Antimicrobial Resistance (AMR) and to work with microbial and antimicrobial data and properties, by using evidence-based methods. **Our aim is to provide a standard** for clean and reproducible AMR data analysis, that can therefore empower epidemiological analyses to continuously enable surveillance and treatment evaluation in any setting. [Many different researchers](https://msberends.github.io/AMR/authors.html) from around the globe are continually helping us to make this a successful and durable project!
 #'
-#' This work was published in the Journal of Statistical Software (Volume 104(3); \doi{jss.v104.i03}) and formed the basis of two PhD theses (\doi{10.33612/diss.177417131} and \doi{10.33612/diss.192486375}).
+#' This work was published in the Journal of Statistical Software (Volume 104(3); \doi{10.18637/jss.v104.i03}) and formed the basis of two PhD theses (\doi{10.33612/diss.177417131} and \doi{10.33612/diss.192486375}).
 #'
-#' After installing this package, R knows [**`r format_included_data_number(AMR::microorganisms)` microorganisms**](https://msberends.github.io/AMR/reference/microorganisms.html) (updated `r format(TAXONOMY_VERSION$GBIF$accessed_date, "%B %Y")`) and all [**`r format_included_data_number(nrow(AMR::antibiotics) + nrow(AMR::antivirals))` antibiotic, antimycotic and antiviral drugs**](https://msberends.github.io/AMR/reference/antibiotics.html) by name and code (including ATC, EARS-Net, ASIARS-Net, PubChem, LOINC and SNOMED CT), and knows all about valid SIR and MIC values. The integral breakpoint guidelines from CLSI and EUCAST are included from the last 10 years. It supports and can read any data format, including WHONET data. This package works on Windows, macOS and Linux with all versions of R since R-3.0 (April 2013). **It was designed to work in any setting, including those with very limited resources**. It was created for both routine data analysis and academic research at the Faculty of Medical Sciences of the [University of Groningen](https://www.rug.nl), in collaboration with non-profit organisations [Certe Medical Diagnostics and Advice Foundation](https://www.certe.nl) and [University Medical Center Groningen](https://www.umcg.nl).
+#' After installing this package, R knows [**`r format_included_data_number(AMR::microorganisms)` microorganisms**](https://msberends.github.io/AMR/reference/microorganisms.html) (updated `r format(TAXONOMY_VERSION$GBIF$accessed_date, "%B %Y")`) and all [**`r format_included_data_number(nrow(AMR::antibiotics) + nrow(AMR::antivirals))` antibiotic, antimycotic and antiviral drugs**](https://msberends.github.io/AMR/reference/antibiotics.html) by name and code (including ATC, EARS-Net, ASIARS-Net, PubChem, LOINC and SNOMED CT), and knows all about valid SIR and MIC values. The integral clinical breakpoint guidelines from CLSI and EUCAST are included, even with epidemiological cut-off (ECOFF) values. It supports and can read any data format, including WHONET data. This package works on Windows, macOS and Linux with all versions of R since R-3.0 (April 2013). **It was designed to work in any setting, including those with very limited resources**. It was created for both routine data analysis and academic research at the Faculty of Medical Sciences of the public [University of Groningen](https://www.rug.nl), in collaboration with non-profit organisations [Certe Medical Diagnostics and Advice Foundation](https://www.certe.nl) and [University Medical Center Groningen](https://www.umcg.nl).
 #'
 #' The `AMR` package is available in `r vector_and(vapply(FUN.VALUE = character(1), LANGUAGES_SUPPORTED_NAMES, function(x) x$exonym), quotes = FALSE, sort = FALSE)`. Antimicrobial drug (group) names and colloquial microorganism names are provided in these languages.
 #' @section Reference Data Publicly Available:
@ -44,7 +44,7 @@
 #' @source
 #' To cite AMR in publications use:
 #'
-#' Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C (2022). "AMR: An R Package for Working with Antimicrobial Resistance Data." _Journal of Statistical Software_, *104*(3), 1-31. \doi{10.18637/jss.v104.i03}.
+#' Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C (2022). "AMR: An R Package for Working with Antimicrobial Resistance Data." _Journal of Statistical Software_, *104*(3), 1-31. \doi{10.18637/jss.v104.i03}
 #'
 #' A BibTeX entry for LaTeX users is:
 #'
--- a/R/aa_globals.R
+++ b/R/aa_globals.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -30,6 +30,12 @@
 # add new version numbers here, and add the rules themselves to "data-raw/eucast_rules.tsv" and clinical_breakpoints
 # (sourcing "data-raw/_pre_commit_hook.R" will process the TSV file)
 EUCAST_VERSION_BREAKPOINTS <- list(
+  # "13.0" = list(
+  #   version_txt = "v13.0",
+  #   year = 2023,
+  #   title = "'EUCAST Clinical Breakpoint Tables'",
+  #   url = "https://www.eucast.org/clinical_breakpoints/"
+  # ),
  "12.0" = list(
    version_txt = "v12.0",
    year = 2022,
@ -50,25 +56,33 @@ EUCAST_VERSION_BREAKPOINTS <- list(
  )
 )
 EUCAST_VERSION_EXPERT_RULES <- list(
-  "3.1" = list(
-    version_txt = "v3.1",
-    year = 2016,
-    title = "'EUCAST Expert Rules, Intrinsic Resistance and Exceptional Phenotypes'",
-    url = "https://www.eucast.org/expert_rules_and_expected_phenotypes/"
+  "3.3" = list(
+    version_txt = "v3.3",
+    year = 2021,
+    title = "'EUCAST Expert Rules' and 'EUCAST Intrinsic Resistance and Unusual Phenotypes'",
+    url = "https://www.eucast.org/expert_rules_and_expected_phenotypes"
  ),
  "3.2" = list(
    version_txt = "v3.2",
    year = 2020,
    title = "'EUCAST Expert Rules' and 'EUCAST Intrinsic Resistance and Unusual Phenotypes'",
-    url = "https://www.eucast.org/expert_rules_and_expected_phenotypes/"
+    url = "https://www.eucast.org/expert_rules_and_expected_phenotypes"
  ),
-  "3.3" = list(
-    version_txt = "v3.3",
-    year = 2021,
-    title = "'EUCAST Expert Rules' and 'EUCAST Intrinsic Resistance and Unusual Phenotypes'",
-    url = "https://www.eucast.org/expert_rules_and_expected_phenotypes/"
+  "3.1" = list(
+    version_txt = "v3.1",
+    year = 2016,
+    title = "'EUCAST Expert Rules, Intrinsic Resistance and Exceptional Phenotypes'",
+    url = "https://www.eucast.org/expert_rules_and_expected_phenotypes"
  )
 )
+# EUCAST_VERSION_RESISTANTPHENOTYPES <- list(
+#   "1.2" = list(
+#     version_txt = "v1.2",
+#     year = 2023,
+#     title = "'Expected Resistant Phenotypes'",
+#     url = "https://www.eucast.org/expert_rules_and_expected_phenotypes"
+#   )
+# )

 TAXONOMY_VERSION <- list(
  GBIF = list(
@ -81,19 +95,25 @@ TAXONOMY_VERSION <- list(
    citation = "Parte, AC *et al.* (2020). **List of Prokaryotic names with Standing in Nomenclature (LPSN) moves to the DSMZ.** International Journal of Systematic and Evolutionary Microbiology, 70, 5607-5612; \\doi{10.1099/ijsem.0.004332}.",
    url = "https://lpsn.dsmz.de"
  ),
+  BacDive = list(
+    accessed_date = as.Date("2023-05-12"),
+    citation = "Reimer, LC *et al.* (2022). ***BacDive* in 2022: the knowledge base for standardized bacterial and archaeal data.** Nucleic Acids Res., 50(D1):D741-D74; \\doi{10.1093/nar/gkab961}.",
+    url = "https://bacdive.dsmz.de"
+  ),
  SNOMED = list(
    accessed_date = as.Date("2021-07-01"),
-    citation = "Public Health Information Network Vocabulary Access and Distribution System (PHIN VADS). US Edition of SNOMED CT from 1 September 2020. Value Set Name 'Microoganism', OID 2.16.840.1.114222.4.11.1009 (v12).",
+    citation = "Public Health Information Network Vocabulary Access and Distribution System (PHIN VADS). US Edition of SNOMED CT from 1 September 2020. Value Set Name 'Microorganism', OID 2.16.840.1.114222.4.11.1009 (v12).",
    url = "https://phinvads.cdc.gov"
  ),
  LOINC = list(
-    accessed_date = as.Date("2022-10-30"),
-    citation = "Logical Observation Identifiers Names and Codes (LOINC), Version 2.73 (8 August, 2022).",
+    accessed_date = as.Date("2023-10-19"),
+    citation = "Logical Observation Identifiers Names and Codes (LOINC), Version 2.76 (18 September, 2023).",
    url = "https://loinc.org"
  )
 )

 globalVariables(c(
+  ".GenericCallEnv",
  ".mo",
  ".rowid",
  ".syndromic_group",
--- a/R/aa_helper_functions.R
+++ b/R/aa_helper_functions.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -501,9 +501,25 @@ word_wrap <- function(...,
  }

  # format backticks
+  if (pkg_is_available("cli") &&
+      tryCatch(isTRUE(getExportedValue("ansi_has_hyperlink_support", ns = asNamespace("cli"))()), error = function(e) FALSE) &&
+      tryCatch(getExportedValue("isAvailable", ns = asNamespace("rstudioapi"))(), error = function(e) return(FALSE)) && 
+      tryCatch(getExportedValue("versionInfo", ns = asNamespace("rstudioapi"))()$version > "2023.6.0.0", error = function(e) return(FALSE))) {
+    # we are in a recent version of RStudio, so do something nice: add links to our help pages in the console.
+    parts <- strsplit(msg, "`", fixed = TRUE)[[1]]
+    cmds <- parts %in% paste0(ls(envir = asNamespace("AMR")), "()")
+    # functions with a dot are not allowed: https://github.com/rstudio/rstudio/issues/11273#issuecomment-1156193252
+    # lead them to the help page of our package
+    parts[cmds & parts %like% "[.]"] <- font_url(url = paste0("ide:help:AMR::", gsub("()", "", parts[cmds & parts %like% "[.]"], fixed = TRUE)),
+                                                 txt = parts[cmds & parts %like% "[.]"])
+    # otherwise, give a 'click to run' popup
+    parts[cmds & parts %unlike% "[.]"] <- font_url(url = paste0("ide:run:AMR::", parts[cmds & parts %unlike% "[.]"]),
+                                                   txt = parts[cmds & parts %unlike% "[.]"])
+    msg <- paste0(parts, collapse = "`")
+  }
  msg <- gsub("`(.+?)`", font_grey_bg("\\1"), msg)
-
-  # clean introduced whitespace between fullstops
+  
+  # clean introduced whitespace in between fullstops
  msg <- gsub("[.] +[.]", "..", msg)
  # remove extra space that was introduced (e.g. "Smith et al. , 2022")
  msg <- gsub(". ,", ".,", msg, fixed = TRUE)
@ -629,7 +645,12 @@ dataset_UTF8_to_ASCII <- function(df) {
 }

 documentation_date <- function(d) {
-  paste0(trimws(format(d, "%e")), " ", month.name[as.integer(format(d, "%m"))], ", ", format(d, "%Y"))
+  day <- as.integer(format(d, "%e"))
+  suffix <- rep("th", length(day))
+  suffix[day %in% c(1, 21, 31)] <- "st"
+  suffix[day %in% c(2, 22)] <- "nd"
+  suffix[day %in% c(3, 23)] <- "rd"
+  paste0(month.name[as.integer(format(d, "%m"))], " ", day, suffix, ", ", format(d, "%Y"))
 }

 format_included_data_number <- function(data) {
@ -1004,7 +1025,7 @@ get_current_column <- function() {

  # cur_column() doesn't always work (only allowed for certain conditions set by dplyr), but it's probably still possible:
  frms <- lapply(sys.frames(), function(env) {
-    if (!is.null(env$i)) {
+    if (tryCatch(!is.null(env$i), error = function(e) FALSE)) {
      if (!is.null(env$tibble_vars)) {
        # for mutate_if()
        env$tibble_vars[env$i]
@ -1177,20 +1198,20 @@ is_dark <- function() {
  }
  isTRUE(AMR_env$is_dark_theme)
 }
-font_black <- function(..., collapse = " ") {
+font_black <- function(..., collapse = " ", adapt = TRUE) {
  before <- "\033[38;5;232m"
  after <- "\033[39m"
-  if (is_dark()) {
+  if (isTRUE(adapt) && is_dark()) {
    # white
    before <- "\033[37m"
    after <- "\033[39m"
  }
  try_colour(..., before = before, after = after, collapse = collapse)
 }
-font_white <- function(..., collapse = " ") {
+font_white <- function(..., collapse = " ", adapt = TRUE) {
  before <- "\033[37m"
  after <- "\033[39m"
-  if (is_dark()) {
+  if (isTRUE(adapt) && is_dark()) {
    # black
    before <- "\033[38;5;232m"
    after <- "\033[39m"
@ -1232,24 +1253,24 @@ font_grey_bg <- function(..., collapse = " ") {
 }
 font_red_bg <- function(..., collapse = " ") {
  # this is #ed553b (picked to be colourblind-safe with other SIR colours)
-  try_colour(font_black(..., collapse = collapse), before = "\033[48;5;203m", after = "\033[49m", collapse = collapse)
+  try_colour(font_black(..., collapse = collapse, adapt = FALSE), before = "\033[48;5;203m", after = "\033[49m", collapse = collapse)
 }
 font_orange_bg <- function(..., collapse = " ") {
  # this is #f6d55c (picked to be colourblind-safe with other SIR colours)
-  try_colour(font_black(..., collapse = collapse), before = "\033[48;5;222m", after = "\033[49m", collapse = collapse)
+  try_colour(font_black(..., collapse = collapse, adapt = FALSE), before = "\033[48;5;222m", after = "\033[49m", collapse = collapse)
 }
 font_yellow_bg <- function(..., collapse = " ") {
-  try_colour(font_black(..., collapse = collapse), before = "\033[48;5;228m", after = "\033[49m", collapse = collapse)
+  try_colour(font_black(..., collapse = collapse, adapt = FALSE), before = "\033[48;5;228m", after = "\033[49m", collapse = collapse)
 }
 font_green_bg <- function(..., collapse = " ") {
  # this is #3caea3 (picked to be colourblind-safe with other SIR colours)
-  try_colour(font_black(..., collapse = collapse), before = "\033[48;5;79m", after = "\033[49m", collapse = collapse)
+  try_colour(font_black(..., collapse = collapse, adapt = FALSE), before = "\033[48;5;79m", after = "\033[49m", collapse = collapse)
 }
 font_purple_bg <- function(..., collapse = " ") {
-  try_colour(font_black(..., collapse = collapse), before = "\033[48;5;89m", after = "\033[49m", collapse = collapse)
+  try_colour(font_black(..., collapse = collapse, adapt = FALSE), before = "\033[48;5;89m", after = "\033[49m", collapse = collapse)
 }
 font_rose_bg <- function(..., collapse = " ") {
-  try_colour(font_black(..., collapse = collapse), before = "\033[48;5;217m", after = "\033[49m", collapse = collapse)
+  try_colour(font_black(..., collapse = collapse, adapt = FALSE), before = "\033[48;5;217m", after = "\033[49m", collapse = collapse)
 }
 font_na <- function(..., collapse = " ") {
  font_red(..., collapse = collapse)
@ -1278,7 +1299,7 @@ font_stripstyle <- function(x) {
  x
 }

-progress_ticker <- function(n = 1, n_min = 0, print = TRUE, ...) {
+progress_ticker <- function(n = 1, n_min = 0, print = TRUE, clear = TRUE, title = "", only_bar_percent = FALSE, ...) {
  if (print == FALSE || n < n_min) {
    # create fake/empty object
    pb <- list()
@ -1294,9 +1315,11 @@ progress_ticker <- function(n = 1, n_min = 0, print = TRUE, ...) {
    progress_bar <- import_fn("progress_bar", "progress", error_on_fail = FALSE)
    if (!is.null(progress_bar)) {
      # so we use progress::progress_bar
-      # a close() method was also added, see below this function
+      # a close()-method was also added, see below for that
      pb <- progress_bar$new(
-        format = "[:bar] :percent (:current/:total,:eta)",
+        format = paste0(title,
+                        ifelse(only_bar_percent == TRUE, "[:bar] :percent", "[:bar] :percent (:current/:total,:eta)")),
+        clear = clear,
        total = n
      )
    } else {
@ -1482,11 +1505,11 @@ add_MO_lookup_to_AMR_env <- function() {

    MO_lookup$kingdom_index <- NA_real_
    MO_lookup[which(MO_lookup$kingdom == "Bacteria" | MO_lookup$mo == "UNKNOWN"), "kingdom_index"] <- 1
-    MO_lookup[which(MO_lookup$kingdom == "Fungi"), "kingdom_index"] <- 2
-    MO_lookup[which(MO_lookup$kingdom == "Protozoa"), "kingdom_index"] <- 3
-    MO_lookup[which(MO_lookup$kingdom == "Archaea"), "kingdom_index"] <- 4
+    MO_lookup[which(MO_lookup$kingdom == "Fungi"), "kingdom_index"] <- 1.25
+    MO_lookup[which(MO_lookup$kingdom == "Protozoa"), "kingdom_index"] <- 1.5
+    MO_lookup[which(MO_lookup$kingdom == "Archaea"), "kingdom_index"] <- 2
    # all the rest
-    MO_lookup[which(is.na(MO_lookup$kingdom_index)), "kingdom_index"] <- 5
+    MO_lookup[which(is.na(MO_lookup$kingdom_index)), "kingdom_index"] <- 3

    # the fullname lowercase, important for the internal algorithms in as.mo()
    MO_lookup$fullname_lower <- tolower(trimws(paste(
@ -1512,6 +1535,10 @@ trimws2 <- function(..., whitespace = "[\u0009\u000A\u000B\u000C\u000D\u0020\u00
  trimws(..., whitespace = whitespace)
 }

+totitle <- function(x) {
+  gsub("^(.)", "\\U\\1", x, perl = TRUE)
+}
+
 readRDS_AMR <- function(file, refhook = NULL) {
  # this is readRDS with remote file support
  con <- file(file)
@ -1522,19 +1549,17 @@ readRDS_AMR <- function(file, refhook = NULL) {
 # Faster data.table implementations ----

 match <- function(x, table, ...) {
-  chmatch <- import_fn("chmatch", "data.table", error_on_fail = FALSE)
-  if (!is.null(chmatch) && is.character(x) && is.character(table)) {
+  if (!is.null(AMR_env$chmatch) && inherits(x, "character") && inherits(table, "character")) {
    # data.table::chmatch() is much faster than base::match() for character
-    chmatch(x, table, ...)
+    AMR_env$chmatch(x, table, ...)
  } else {
    base::match(x, table, ...)
  }
 }
 `%in%` <- function(x, table) {
-  chin <- import_fn("%chin%", "data.table", error_on_fail = FALSE)
-  if (!is.null(chin) && is.character(x) && is.character(table)) {
+  if (!is.null(AMR_env$chin) && inherits(x, "character") && inherits(table, "character")) {
    # data.table::`%chin%`() is much faster than base::`%in%`() for character
-    chin(x, table)
+    AMR_env$chin(x, table)
  } else {
    base::`%in%`(x, table)
  }
--- a/R/aa_helper_pm_functions.R
+++ b/R/aa_helper_pm_functions.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/aa_options.R
+++ b/R/aa_options.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -37,6 +37,7 @@
 #' * `AMR_guideline` \cr Used for setting the default guideline for interpreting MIC values and disk diffusion diameters with [as.sir()]. Can be only the guideline name (e.g., `"CLSI"`) or the name with a year (e.g. `"CLSI 2019"`). The default to the latest implemented EUCAST guideline, currently \code{"`r clinical_breakpoints$guideline[1]`"}. Supported guideline are currently EUCAST (`r min(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`) and CLSI (`r min(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "CLSI")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "CLSI")$guideline)))`).
 #' * `AMR_ignore_pattern` \cr A [regular expression][base::regex] to ignore (i.e., make `NA`) any match given in [as.mo()] and all [`mo_*`][mo_property()] functions.
 #' * `AMR_include_PKPD` \cr A [logical] to use in [as.sir()], to indicate that PK/PD clinical breakpoints must be applied as a last resort - the default is `TRUE`.
+#' * `AMR_ecoff` \cr A [logical] use in [as.sir()], to indicate that ECOFF (Epidemiological Cut-Off) values must be used - the default is `FALSE`.
 #' * `AMR_include_screening` \cr A [logical] to use in [as.sir()], to indicate that clinical breakpoints for screening are allowed - the default is `FALSE`.
 #' * `AMR_keep_synonyms` \cr A [logical] to use in [as.mo()] and all [`mo_*`][mo_property()] functions, to indicate if old, previously valid taxonomic names must be preserved and not be corrected to currently accepted names. The default is `FALSE`.
 #' * `AMR_cleaning_regex` \cr A [regular expression][base::regex] (case-insensitive) to use in [as.mo()] and all [`mo_*`][mo_property()] functions, to clean the user input. The default is the outcome of [mo_cleaning_regex()], which removes texts between brackets and texts such as "species" and "serovar".
--- a/R/ab.R
+++ b/R/ab.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -545,6 +545,13 @@ is.ab <- function(x) {
 pillar_shaft.ab <- function(x, ...) {
  out <- trimws(format(x))
  out[is.na(x)] <- font_na(NA)
+  
+  # add the names to the drugs as mouse-over!
+  if (tryCatch(isTRUE(getExportedValue("ansi_has_hyperlink_support", ns = asNamespace("cli"))()), error = function(e) FALSE)) {
+    out[!is.na(x)] <- font_url(url = paste0(x[!is.na(x)], ": ", ab_name(x[!is.na(x)])),
+                               txt = out[!is.na(x)])
+  }
+  
  create_pillar_column(out, align = "left", min_width = 4)
 }

--- a/R/ab_from_text.R
+++ b/R/ab_from_text.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/ab_property.R
+++ b/R/ab_property.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -69,7 +69,7 @@
 #' ab_atc_group2("AMX")
 #' ab_url("AMX")
 #'
-#' # smart lowercase tranformation
+#' # smart lowercase transformation
 #' ab_name(x = c("AMC", "PLB"))
 #' ab_name(x = c("AMC", "PLB"), tolower = TRUE)
 #'
--- a/R/ab_selectors.R
+++ b/R/ab_selectors.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -620,7 +620,7 @@ administrable_iv <- function(only_sir_columns = FALSE, ...) {

 #' @rdname antibiotic_class_selectors
 #' @inheritParams eucast_rules
-#' @details The [not_intrinsic_resistant()] function can be used to only select antibiotic columns that pose no intrinsic resistance for the microorganisms in the data set. For example, if a data set contains only microorganism codes or names of *E. coli* and *K. pneumoniae* and contains a column "vancomycin", this column will be removed (or rather, unselected) using this function. It currently applies `r format_eucast_version_nr(names(EUCAST_VERSION_EXPERT_RULES[length(EUCAST_VERSION_EXPERT_RULES)]))` to determine intrinsic resistance, using the [eucast_rules()] function internally. Because of this determination, this function is quite slow in terms of performance.
+#' @details The [not_intrinsic_resistant()] function can be used to only select antibiotic columns that pose no intrinsic resistance for the microorganisms in the data set. For example, if a data set contains only microorganism codes or names of *E. coli* and *K. pneumoniae* and contains a column "vancomycin", this column will be removed (or rather, unselected) using this function. It currently applies `r format_eucast_version_nr(names(EUCAST_VERSION_EXPERT_RULES[1]))` to determine intrinsic resistance, using the [eucast_rules()] function internally. Because of this determination, this function is quite slow in terms of performance.
 #' @export
 not_intrinsic_resistant <- function(only_sir_columns = FALSE, col_mo = NULL, version_expertrules = 3.3, ...) {
  meet_criteria(only_sir_columns, allow_class = "logical", has_length = 1)
--- a/R/age.R
+++ b/R/age.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/antibiogram.R
+++ b/R/antibiogram.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/atc_online.R
+++ b/R/atc_online.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/av.R
+++ b/R/av.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/av_from_text.R
+++ b/R/av_from_text.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/av_property.R
+++ b/R/av_property.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -61,7 +61,7 @@
 #' av_group("ACI")
 #' av_url("ACI")
 #'
-#' # smart lowercase tranformation
+#' # lowercase transformation
 #' av_name(x = c("ACI", "VALA"))
 #' av_name(x = c("ACI", "VALA"), tolower = TRUE)
 #'
--- a/R/availability.R
+++ b/R/availability.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/bug_drug_combinations.R
+++ b/R/bug_drug_combinations.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/count.R
+++ b/R/count.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/custom_antimicrobials.R
+++ b/R/custom_antimicrobials.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/custom_eucast_rules.R
+++ b/R/custom_eucast_rules.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/custom_microorganisms.R
+++ b/R/custom_microorganisms.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -71,7 +71,8 @@
 #' @examples
 #' \donttest{
 #' # a combination of species is not formal taxonomy, so
-#' # this will result in only "Enterobacter asburiae":
+#' # this will result in "Enterobacter cloacae cloacae",
+#' # since it resembles the input best:
 #' mo_name("Enterobacter asburiae/cloacae")
 #'
 #' # now add a custom entry - it will be considered by as.mo() and
@ -109,7 +110,7 @@
 #' mo_name("BACTEROIDES / PARABACTEROIDES")
 #' mo_rank("BACTEROIDES / PARABACTEROIDES")
 #'
-#' # taxonomy still works, although a slashline genus was given as input:
+#' # taxonomy still works, even though a slashline genus was given as input:
 #' mo_family("Bacteroides/Parabacteroides")
 #'
 #'
--- a/R/data.R
+++ b/R/data.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -32,9 +32,9 @@
 #' Two data sets containing all antibiotics/antimycotics and antivirals. Use [as.ab()] or one of the [`ab_*`][ab_property()] functions to retrieve values from the [antibiotics] data set. Three identifiers are included in this data set: an antibiotic ID (`ab`, primarily used in this package) as defined by WHONET/EARS-Net, an ATC code (`atc`) as defined by the WHO, and a Compound ID (`cid`) as found in PubChem. Other properties in this data set are derived from one or more of these codes. Note that some drugs have multiple ATC codes.
 #' @format
 #' ### For the [antibiotics] data set: a [tibble][tibble::tibble] with `r nrow(antibiotics)` observations and `r ncol(antibiotics)` variables:
-#' - `ab`\cr Antibiotic ID as used in this package (such as `AMC`), using the official EARS-Net (European Antimicrobial Resistance Surveillance Network) codes where available
-#' - `cid`\cr Compound ID as found in PubChem
-#' - `name`\cr Official name as used by WHONET/EARS-Net or the WHO
+#' - `ab`\cr Antibiotic ID as used in this package (such as `AMC`), using the official EARS-Net (European Antimicrobial Resistance Surveillance Network) codes where available. *This is a unique identifier.*
+#' - `cid`\cr Compound ID as found in PubChem. *This is a unique identifier.*
+#' - `name`\cr Official name as used by WHONET/EARS-Net or the WHO. *This is a unique identifier.*
 #' - `group`\cr A short and concise group name, based on WHONET and WHOCC definitions
 #' - `atc`\cr ATC codes (Anatomical Therapeutic Chemical) as defined by the WHOCC, like `J01CR02`
 #' - `atc_group1`\cr Official pharmacological subgroup (3rd level ATC code) as defined by the WHOCC, like `"Macrolides, lincosamides and streptogramins"`
@ -45,20 +45,20 @@
 #' - `oral_units`\cr Units of `oral_ddd`
 #' - `iv_ddd`\cr Defined Daily Dose (DDD), parenteral (intravenous) treatment, currently available for `r sum(!is.na(antibiotics$iv_ddd))` drugs
 #' - `iv_units`\cr Units of `iv_ddd`
-#' - `loinc`\cr All LOINC codes (Logical Observation Identifiers Names and Codes) associated with the name of the antimicrobial drug. Use [ab_loinc()] to retrieve them quickly, see [ab_property()].
+#' - `loinc`\cr All codes associated with the name of the antimicrobial drug from `r TAXONOMY_VERSION$LOINC$citation` Use [ab_loinc()] to retrieve them quickly, see [ab_property()].
 #'
 #' ### For the [antivirals] data set: a [tibble][tibble::tibble] with `r nrow(antivirals)` observations and `r ncol(antivirals)` variables:
-#' - `av`\cr Antibiotic ID as used in this package (such as `AMC`), using the official EARS-Net (European Antimicrobial Resistance Surveillance Network) codes where available
-#' - `name`\cr Official name as used by WHONET/EARS-Net or the WHO
+#' - `av`\cr Antiviral ID as used in this package (such as `ACI`), using the official EARS-Net (European Antimicrobial Resistance Surveillance Network) codes where available. *This is a unique identifier.* Combinations are codes that contain a `+` to indicate this, such as `ATA+COBI` for atazanavir/cobicistat.
+#' - `name`\cr Official name as used by WHONET/EARS-Net or the WHO. *This is a unique identifier.*
 #' - `atc`\cr ATC codes (Anatomical Therapeutic Chemical) as defined by the WHOCC
-#' - `cid`\cr Compound ID as found in PubChem
+#' - `cid`\cr Compound ID as found in PubChem. *This is a unique identifier.*
 #' - `atc_group`\cr Official pharmacological subgroup (3rd level ATC code) as defined by the WHOCC
 #' - `synonyms`\cr Synonyms (often trade names) of a drug, as found in PubChem based on their compound ID
 #' - `oral_ddd`\cr Defined Daily Dose (DDD), oral treatment
 #' - `oral_units`\cr Units of `oral_ddd`
 #' - `iv_ddd`\cr Defined Daily Dose (DDD), parenteral treatment
 #' - `iv_units`\cr Units of `iv_ddd`
-#' - `loinc`\cr All LOINC codes (Logical Observation Identifiers Names and Codes) associated with the name of the antimicrobial drug.
+#' - `loinc`\cr All codes associated with the name of the antiviral drug from `r TAXONOMY_VERSION$LOINC$citation` Use [av_loinc()] to retrieve them quickly, see [av_property()].
 #' @details Properties that are based on an ATC code are only available when an ATC is available. These properties are: `atc_group1`, `atc_group2`, `oral_ddd`, `oral_units`, `iv_ddd` and `iv_units`.
 #'
 #' Synonyms (i.e. trade names) were derived from the PubChem Compound ID (column `cid`) and consequently only available where a CID is available.
@ -86,12 +86,12 @@
 #'
 #' A data set containing the full microbial taxonomy (**last updated: `r documentation_date(max(TAXONOMY_VERSION$GBIF$accessed_date, TAXONOMY_VERSION$LPSN$accessed_date))`**) of `r nr2char(length(unique(microorganisms$kingdom[!microorganisms$kingdom %like% "unknown"])))` kingdoms from the List of Prokaryotic names with Standing in Nomenclature (LPSN) and the Global Biodiversity Information Facility (GBIF). This data set is the backbone of this `AMR` package. MO codes can be looked up using [as.mo()].
 #' @format A [tibble][tibble::tibble] with `r format(nrow(microorganisms), big.mark = " ")` observations and `r ncol(microorganisms)` variables:
-#' - `mo`\cr ID of microorganism as used by this package
-#' - `fullname`\cr Full name, like `"Escherichia coli"`. For the taxonomic ranks genus, species and subspecies, this is the 'pasted' text of genus, species, and subspecies. For all taxonomic ranks higher than genus, this is the name of the taxon.
+#' - `mo`\cr ID of microorganism as used by this package. *This is a unique identifier.*
+#' - `fullname`\cr Full name, like `"Escherichia coli"`. For the taxonomic ranks genus, species and subspecies, this is the 'pasted' text of genus, species, and subspecies. For all taxonomic ranks higher than genus, this is the name of the taxon. *This is a unique identifier.*
 #' - `status` \cr Status of the taxon, either `r vector_or(microorganisms$status)`
 #' - `kingdom`, `phylum`, `class`, `order`, `family`, `genus`, `species`, `subspecies`\cr Taxonomic rank of the microorganism
 #' - `rank`\cr Text of the taxonomic rank of the microorganism, such as `"species"` or `"genus"`
-#' - `ref`\cr Author(s) and year of related scientific publication. This contains only the *first surname* and year of the *latest* authors, e.g. "Wallis *et al.* 2006 *emend.* Smith and Jones 2018" becomes "Smith *et al.*, 2018". This field is directly retrieved from the source specified in the column `source`. Moreover, accents were removed to comply with CRAN that only allows ASCII characters, e.g. "V`r "\u00e1\u0148ov\u00e1"`" becomes "Vanova".
+#' - `ref`\cr Author(s) and year of related scientific publication. This contains only the *first surname* and year of the *latest* authors, e.g. "Wallis *et al.* 2006 *emend.* Smith and Jones 2018" becomes "Smith *et al.*, 2018". This field is directly retrieved from the source specified in the column `source`. Moreover, accents were removed to comply with CRAN that only allows ASCII characters.
 #' - `lpsn`\cr Identifier ('Record number') of the List of Prokaryotic names with Standing in Nomenclature (LPSN). This will be the first/highest LPSN identifier to keep one identifier per row. For example, *Acetobacter ascendens* has LPSN Record number 7864 and 11011. Only the first is available in the `microorganisms` data set.
 #' - `oxygen_tolerance` \cr Oxygen tolerance, either `r vector_or(microorganisms$oxygen_tolerance)`. These data were retrieved from BacDive (see *Source*). Items that contain "likely" are missing from BacDive and were extrapolated from other species within the same genus to guess the oxygen tolerance. Currently `r round(length(microorganisms$oxygen_tolerance[which(!is.na(microorganisms$oxygen_tolerance))]) / nrow(microorganisms[which(microorganisms$kingdom == "Bacteria"), ]) * 100, 1)`% of all `r format_included_data_number(nrow(microorganisms[which(microorganisms$kingdom == "Bacteria"), ]))` bacteria in the data set contain an oxygen tolerance.
 #' - `lpsn_parent`\cr LPSN identifier of the parent taxon
@ -122,8 +122,7 @@
 #' For convenience, some entries were added manually:
 #'
 #' - `r format_included_data_number(microorganisms[which(microorganisms$source == "manually added" & microorganisms$genus == "Salmonella"), , drop = FALSE])` entries of *Salmonella*, such as the city-like serovars and groups A to H
-#' - `r format_included_data_number(microorganisms[which(microorganisms$source == "manually added" & microorganisms$genus == "Streptococcus"), , drop = FALSE])` entries of *Streptococcus*, such as the beta-haemolytic groups A to K, viridans, and milleri
-#' - 2 entries of *Staphylococcus* (coagulase-negative (CoNS) and coagulase-positive (CoPS))
+#' - `r format_included_data_number(length(which(microorganisms$rank == "species group")))` species groups (such as the beta-haemolytic *Streptococcus* groups A to K, coagulase-negative *Staphylococcus* (CoNS), *Mycobacterium tuberculosis* complex, etc.), of which the group compositions are stored in the [microorganisms.groups] data set
 #' - 1 entry of *Blastocystis* (*B.  hominis*), although it officially does not exist (Noel *et al.* 2005, PMID 15634993)
 #' - 1 entry of *Moraxella* (*M. catarrhalis*), which was formally named *Branhamella catarrhalis* (Catlin, 1970) though this change was never accepted within the field of clinical microbiology
 #' - 8 other 'undefined' entries (unknown, unknown Gram-negatives, unknown Gram-positives, unknown yeast, unknown fungus, and unknown anaerobic Gram-pos/Gram-neg bacteria)
@ -141,31 +140,58 @@
 #'
 #' * `r TAXONOMY_VERSION$GBIF$citation` Accessed from <`r TAXONOMY_VERSION$GBIF$url`> on `r documentation_date(TAXONOMY_VERSION$GBIF$accessed_date)`.
 #'
+#' * `r TAXONOMY_VERSION$BacDive$citation` Accessed from <`r TAXONOMY_VERSION$BacDive$url`> on `r documentation_date(TAXONOMY_VERSION$BacDive$accessed_date)`.
+#' 
 #' * `r TAXONOMY_VERSION$SNOMED$citation` URL: <`r TAXONOMY_VERSION$SNOMED$url`>
 #'
 #' * Grimont *et al.* (2007). Antigenic Formulae of the Salmonella Serovars, 9th Edition. WHO Collaborating Centre for Reference and Research on *Salmonella* (WHOCC-SALM).
 #'
 #' * Bartlett *et al.* (2022). **A comprehensive list of bacterial pathogens infecting humans** *Microbiology* 168:001269; \doi{10.1099/mic.0.001269}
-#' 
-#' * Reimer *et al.* (2022). ***BacDive* in 2022: the knowledge base for standardized bacterial and archaeal data.**  *Nucleic Acids Res.* 2022 Jan 7;50(D1):D741-D746; \doi{10.1093/nar/gkab961}
-#' @seealso [as.mo()], [mo_property()], [microorganisms.codes], [intrinsic_resistant]
+#' @seealso [as.mo()], [mo_property()], [microorganisms.groups], [microorganisms.codes], [intrinsic_resistant]
 #' @examples
 #' microorganisms
 "microorganisms"

 #' Data Set with `r format(nrow(microorganisms.codes), big.mark = " ")` Common Microorganism Codes
 #'
-#' A data set containing commonly used codes for microorganisms, from laboratory systems and WHONET. Define your own with [set_mo_source()]. They will all be searched when using [as.mo()] and consequently all the [`mo_*`][mo_property()] functions.
+#' A data set containing commonly used codes for microorganisms, from laboratory systems and [WHONET](https://whonet.org). Define your own with [set_mo_source()]. They will all be searched when using [as.mo()] and consequently all the [`mo_*`][mo_property()] functions.
 #' @format A [tibble][tibble::tibble] with `r format(nrow(microorganisms.codes), big.mark = " ")` observations and `r ncol(microorganisms.codes)` variables:
-#' - `code`\cr Commonly used code of a microorganism
+#' - `code`\cr Commonly used code of a microorganism. *This is a unique identifier.*
 #' - `mo`\cr ID of the microorganism in the [microorganisms] data set
 #' @details
 #' Like all data sets in this package, this data set is publicly available for download in the following formats: R, MS Excel, Apache Feather, Apache Parquet, SPSS, SAS, and Stata. Please visit [our website for the download links](https://msberends.github.io/AMR/articles/datasets.html). The actual files are of course available on [our GitHub repository](https://github.com/msberends/AMR/tree/main/data-raw).
 #' @seealso [as.mo()] [microorganisms]
 #' @examples
 #' microorganisms.codes
+#' 
+#' # 'ECO' or 'eco' is the WHONET code for E. coli:
+#' microorganisms.codes[microorganisms.codes$code == "ECO", ]
+#' 
+#' # and therefore, 'eco' will be understood as E. coli in this package:
+#' mo_info("eco")
+#' 
+#' # works for all AMR functions:
+#' mo_is_intrinsic_resistant("eco", ab = "vancomycin")
 "microorganisms.codes"

+#' Data Set with `r format(nrow(microorganisms.groups), big.mark = " ")` Microorganisms In Species Groups
+#'
+#' A data set containing species groups and microbiological complexes, which are used in [the clinical breakpoints table][clinical_breakpoints].
+#' @format A [tibble][tibble::tibble] with `r format(nrow(microorganisms.groups), big.mark = " ")` observations and `r ncol(microorganisms.groups)` variables:
+#' - `mo_group`\cr ID of the species group / microbiological complex
+#' - `mo`\cr ID of the microorganism belonging in the species group / microbiological complex
+#' - `mo_group_name`\cr Name of the species group / microbiological complex, as retrieved with [mo_name()]
+#' - `mo_name`\cr Name of the microorganism belonging in the species group / microbiological complex, as retrieved with [mo_name()]
+#' @details
+#' Like all data sets in this package, this data set is publicly available for download in the following formats: R, MS Excel, Apache Feather, Apache Parquet, SPSS, SAS, and Stata. Please visit [our website for the download links](https://msberends.github.io/AMR/articles/datasets.html). The actual files are of course available on [our GitHub repository](https://github.com/msberends/AMR/tree/main/data-raw).
+#' @seealso [as.mo()] [microorganisms]
+#' @examples
+#' microorganisms.groups
+#' 
+#' # these are all species in the Bacteroides fragilis group, as per WHONET:
+#' microorganisms.groups[microorganisms.groups$mo_group == "B_BCTRD_FRGL-C", ]
+"microorganisms.groups"
+
 #' Data Set with `r format(nrow(example_isolates), big.mark = " ")` Example Isolates
 #'
 #' A data set containing `r format(nrow(example_isolates), big.mark = " ")` microbial isolates with their full antibiograms. This data set contains randomised fictitious data, but reflects reality and can be used to practise AMR data analysis. For examples, please read [the tutorial on our website](https://msberends.github.io/AMR/articles/AMR.html).
@ -239,20 +265,33 @@
 #' Data set containing clinical breakpoints to interpret MIC and disk diffusion to SIR values, according to international guidelines. Currently implemented guidelines are EUCAST (`r min(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`) and CLSI (`r min(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "CLSI")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(clinical_breakpoints, guideline %like% "CLSI")$guideline)))`). Use [as.sir()] to transform MICs or disks measurements to SIR values.
 #' @format A [tibble][tibble::tibble] with `r format(nrow(clinical_breakpoints), big.mark = " ")` observations and `r ncol(clinical_breakpoints)` variables:
 #' - `guideline`\cr Name of the guideline
-#' - `method`\cr Either `r vector_or(clinical_breakpoints$method)`
-#' - `site`\cr Body site, e.g. "Oral" or "Respiratory"
+#' - `type`\cr Breakpoint type, either `r vector_or(clinical_breakpoints$type)`
+#' - `method`\cr Testing method, either `r vector_or(clinical_breakpoints$method)`
+#' - `site`\cr Body site for which the breakpoint must be applied, e.g. "Oral" or "Respiratory"
 #' - `mo`\cr Microbial ID, see [as.mo()]
 #' - `rank_index`\cr Taxonomic rank index of `mo` from 1 (subspecies/infraspecies) to 5 (unknown microorganism)
-#' - `ab`\cr Antibiotic ID, see [as.ab()]
+#' - `ab`\cr Antibiotic code as used by this package, EARS-Net and WHONET, see [as.ab()]
 #' - `ref_tbl`\cr Info about where the guideline rule can be found
 #' - `disk_dose`\cr Dose of the used disk diffusion method
 #' - `breakpoint_S`\cr Lowest MIC value or highest number of millimetres that leads to "S"
 #' - `breakpoint_R`\cr Highest MIC value or lowest number of millimetres that leads to "R"
 #' - `uti`\cr A [logical] value (`TRUE`/`FALSE`) to indicate whether the rule applies to a urinary tract infection (UTI)
 #' @details
-#' Like all data sets in this package, this data set is publicly available for download in the following formats: R, MS Excel, Apache Feather, Apache Parquet, SPSS, SAS, and Stata. Please visit [our website for the download links](https://msberends.github.io/AMR/articles/datasets.html). The actual files are of course available on [our GitHub repository](https://github.com/msberends/AMR/tree/main/data-raw).
-#'
-#' They **allow for machine reading EUCAST and CLSI guidelines**, which is almost impossible with the MS Excel and PDF files distributed by EUCAST and CLSI.
+#' ### Different types of breakpoints
+#' Supported types of breakpoints are `r vector_and(clinical_breakpoints$type, quote = FALSE)`. ECOFF (Epidemiological cut-off) values are used in antimicrobial susceptibility testing to differentiate between wild-type and non-wild-type strains of bacteria or fungi.
+#' 
+#' The default is `"human"`, which can also be set with the [package option][AMR-options] [`AMR_breakpoint_type`][AMR-options]. Use [`as.sir(..., breakpoint_type = ...)`][as.sir()] to interpret raw data using a specific breakpoint type, e.g. `as.sir(..., breakpoint_type = "ECOFF")` to use ECOFFs.
+#' 
+#' ### Imported from WHONET
+#' Clinical breakpoints in this package were validated through and imported from [WHONET](https://whonet.org), a free desktop Windows application developed and supported by the WHO Collaborating Centre for Surveillance of Antimicrobial Resistance. More can be read on [their website](https://whonet.org). The developers of WHONET and this `AMR` package have been in contact about sharing their work. We highly appreciate their development on the WHONET software.
+#' 
+#' ### Response from CLSI and EUCAST
+#' The CEO of CLSI and the chairman of EUCAST have endorsed the work and public use of this `AMR` package (and consequently the use of their breakpoints) in June 2023, when future development of distributing clinical breakpoints was discussed in a meeting between CLSI, EUCAST, the WHO, and developers of WHONET and the `AMR` package.
+#' 
+#' ### Download
+#' Like all data sets in this package, this data set is publicly available for download in the following formats: R, MS Excel, Apache Feather, Apache Parquet, SPSS, SAS, and Stata. Please visit [our website for the download links](https://msberends.github.io/AMR/articles/datasets.html). The actual files are of course available on [our GitHub repository](https://github.com/msberends/AMR/tree/main/data-raw). They allow for machine reading EUCAST and CLSI guidelines, which is almost impossible with the MS Excel and PDF files distributed by EUCAST and CLSI, though initiatives have started to overcome these burdens.
+#' 
+#' **NOTE:** this `AMR` package (and the WHONET software as well) contains internal methods to apply the guidelines, which is rather complex. For example, some breakpoints must be applied on certain species groups (which are in case of this package available through the [microorganisms.groups] data set). It is important that this is considered when using the breakpoints for own use.
 #' @seealso [intrinsic_resistant]
 #' @examples
 #' clinical_breakpoints
@ -287,11 +326,8 @@
 #' - `administration`\cr Route of administration, either `r vector_or(dosage$administration)`
 #' - `notes`\cr Additional dosage notes
 #' - `original_txt`\cr Original text in the PDF file of EUCAST
-#' - `eucast_version`\cr Version number of the EUCAST Clinical Breakpoints guideline to which these dosages apply
+#' - `eucast_version`\cr Version number of the EUCAST Clinical Breakpoints guideline to which these dosages apply, either `r vector_or(dosage$eucast_version, quotes = FALSE, sort = TRUE, reverse = TRUE)`
 #' @details
-#' This data set is based on `r format_eucast_version_nr(12.0)` and `r format_eucast_version_nr(11.0)`.
-#'
-#' ### Direct download
 #' Like all data sets in this package, this data set is publicly available for download in the following formats: R, MS Excel, Apache Feather, Apache Parquet, SPSS, SAS, and Stata. Please visit [our website for the download links](https://msberends.github.io/AMR/articles/datasets.html). The actual files are of course available on [our GitHub repository](https://github.com/msberends/AMR/tree/main/data-raw).
 #' @examples
 #' dosage
--- a/R/disk.R
+++ b/R/disk.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -70,7 +70,7 @@
 #' # interpret whole data set, pretend to be all from urinary tract infections:
 #' as.sir(df, uti = TRUE)
 as.disk <- function(x, na.rm = FALSE) {
-  meet_criteria(x, allow_class = c("disk", "character", "numeric", "integer"), allow_NA = TRUE)
+  meet_criteria(x, allow_NA = TRUE)
  meet_criteria(na.rm, allow_class = "logical", has_length = 1)

  if (!is.disk(x)) {
--- a/R/eucast_rules.R
+++ b/R/eucast_rules.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -63,8 +63,9 @@ format_eucast_version_nr <- function(version, markdown = TRUE) {
 #' @param info a [logical] to indicate whether progress should be printed to the console - the default is only print while in interactive sessions
 #' @param rules a [character] vector that specifies which rules should be applied. Must be one or more of `"breakpoints"`, `"expert"`, `"other"`, `"custom"`, `"all"`, and defaults to `c("breakpoints", "expert")`. The default value can be set to another value using the [package option][AMR-options] [`AMR_eucastrules`][AMR-options]: `options(AMR_eucastrules = "all")`. If using `"custom"`, be sure to fill in argument `custom_rules` too. Custom rules can be created with [custom_eucast_rules()].
 #' @param verbose a [logical] to turn Verbose mode on and off (default is off). In Verbose mode, the function does not apply rules to the data, but instead returns a data set in logbook form with extensive info about which rows and columns would be effected and in which way. Using Verbose mode takes a lot more time.
-#' @param version_breakpoints the version number to use for the EUCAST Clinical Breakpoints guideline. Can be either `r vector_or(names(EUCAST_VERSION_BREAKPOINTS), reverse = TRUE)`.
-#' @param version_expertrules the version number to use for the EUCAST Expert Rules and Intrinsic Resistance guideline. Can be either `r vector_or(names(EUCAST_VERSION_EXPERT_RULES), reverse = TRUE)`.
+#' @param version_breakpoints the version number to use for the EUCAST Clinical Breakpoints guideline. Can be `r vector_or(names(EUCAST_VERSION_BREAKPOINTS), reverse = TRUE)`.
+#' @param version_expertrules the version number to use for the EUCAST Expert Rules and Intrinsic Resistance guideline. Can be `r vector_or(names(EUCAST_VERSION_EXPERT_RULES), reverse = TRUE)`.
+# @param version_resistant_phenotypes the version number to use for the EUCAST Expected Resistant Phenotypes. Can be `r vector_or(names(EUCAST_VERSION_RESISTANTPHENOTYPES), reverse = TRUE)`.
 #' @param ampc_cephalosporin_resistance a [character] value that should be applied to cefotaxime, ceftriaxone and ceftazidime for AmpC de-repressed cephalosporin-resistant mutants - the default is `NA`. Currently only works when `version_expertrules` is `3.2` and higher; these version of '*EUCAST Expert Rules on Enterobacterales*' state that results of cefotaxime, ceftriaxone and ceftazidime should be reported with a note, or results should be suppressed (emptied) for these three drugs. A value of `NA` (the default) for this argument will remove results for these three drugs, while e.g. a value of `"R"` will make the results for these drugs resistant. Use `NULL` or `FALSE` to not alter results for these three drugs of AmpC de-repressed cephalosporin-resistant mutants. Using `TRUE` is equal to using `"R"`. \cr For *EUCAST Expert Rules* v3.2, this rule applies to: `r vector_and(gsub("[^a-zA-Z ]+", "", unlist(strsplit(EUCAST_RULES_DF[which(EUCAST_RULES_DF$reference.version %in% c(3.2, 3.3) & EUCAST_RULES_DF$reference.rule %like% "ampc"), "this_value"][1], "|", fixed = TRUE))), quotes = "*")`.
 #' @param ... column name of an antibiotic, see section *Antibiotics* below
 #' @param ab any (vector of) text that can be coerced to a valid antibiotic drug code with [as.ab()]
@ -167,6 +168,7 @@ eucast_rules <- function(x,
                         verbose = FALSE,
                         version_breakpoints = 12.0,
                         version_expertrules = 3.3,
+                         # TODO version_resistant_phenotypes = 1.2,
                         ampc_cephalosporin_resistance = NA,
                         only_sir_columns = FALSE,
                         custom_rules = NULL,
@ -178,6 +180,7 @@ eucast_rules <- function(x,
  meet_criteria(verbose, allow_class = "logical", has_length = 1)
  meet_criteria(version_breakpoints, allow_class = c("numeric", "integer"), has_length = 1, is_in = as.double(names(EUCAST_VERSION_BREAKPOINTS)))
  meet_criteria(version_expertrules, allow_class = c("numeric", "integer"), has_length = 1, is_in = as.double(names(EUCAST_VERSION_EXPERT_RULES)))
+  # meet_criteria(version_resistant_phenotypes, allow_class = c("numeric", "integer"), has_length = 1, is_in = as.double(names(EUCAST_VERSION_RESISTANTPHENOTYPES)))
  meet_criteria(ampc_cephalosporin_resistance, allow_class = c("logical", "character", "sir"), has_length = 1, allow_NA = TRUE, allow_NULL = TRUE)
  meet_criteria(only_sir_columns, allow_class = "logical", has_length = 1)
  meet_criteria(custom_rules, allow_class = "custom_eucast_rules", allow_NULL = TRUE)
@ -205,7 +208,8 @@ eucast_rules <- function(x,

  breakpoints_info <- EUCAST_VERSION_BREAKPOINTS[[which(as.double(names(EUCAST_VERSION_BREAKPOINTS)) == version_breakpoints)]]
  expertrules_info <- EUCAST_VERSION_EXPERT_RULES[[which(as.double(names(EUCAST_VERSION_EXPERT_RULES)) == version_expertrules)]]
-
+  # resistantphenotypes_info <- EUCAST_VERSION_RESISTANTPHENOTYPES[[which(as.double(names(EUCAST_VERSION_RESISTANTPHENOTYPES)) == version_resistant_phenotypes)]]
+  
  # support old setting (until AMR v1.3.0)
  if (missing(rules) && !is.null(getOption("AMR.eucast_rules"))) {
    rules <- getOption("AMR.eucast_rules")
--- a/R/first_isolate.R
+++ b/R/first_isolate.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -191,13 +191,14 @@ first_isolate <- function(x = NULL,
  }
  meet_criteria(col_specimen, allow_class = "character", has_length = 1, allow_NULL = TRUE, is_in = colnames(x))
  if (is.logical(col_icu)) {
-    meet_criteria(col_icu, allow_class = "logical", has_length = c(1, nrow(x)), allow_NULL = TRUE)
-    if (length(col_icu) == 1) {
-      col_icu <- rep(col_icu, nrow(x))
-    }
-  } else {
+    meet_criteria(col_icu, allow_class = "logical", has_length = c(1, nrow(x)), allow_NA = TRUE, allow_NULL = TRUE)
+    x$newvar_is_icu <- col_icu
+  } else if (!is.null(col_icu)) {
+    # add "logical" to the allowed classes here, since it may give an error in certain user input, and should then also say that logicals can be used too
    meet_criteria(col_icu, allow_class = c("character", "logical"), has_length = 1, allow_NULL = TRUE, is_in = colnames(x))
-    col_icu <- x[, col_icu, drop = TRUE]
+    x$newvar_is_icu <- x[, col_icu, drop = TRUE]
+  } else {
+    x$newvar_is_icu <- NA
  }
  # method
  method <- coerce_method(method)
@ -251,14 +252,13 @@ first_isolate <- function(x = NULL,
        "Determining first isolates ",
        ifelse(method %in% c("episode-based", "phenotype-based"),
          ifelse(is.infinite(episode_days),
-            "without a specified episode length",
-            paste("using an episode length of", episode_days, "days")
+            paste(font_bold("without"), " a specified episode length"),
+            paste("using an episode length of", font_bold(paste(episode_days, "days")))
          ),
          ""
        )
      ),
-      as_note = FALSE,
-      add_fn = font_black
+      add_fn = font_red
    )
  }

@ -347,8 +347,8 @@ first_isolate <- function(x = NULL,

  # create original row index
  x$newvar_row_index <- seq_len(nrow(x))
-  x$newvar_mo <- as.mo(x[, col_mo, drop = TRUE])
-  x$newvar_genus_species <- paste(mo_genus(x$newvar_mo), mo_species(x$newvar_mo))
+  x$newvar_mo <- as.mo(x[, col_mo, drop = TRUE], keep_synonyms = TRUE, info = FALSE)
+  x$newvar_genus_species <- paste(mo_genus(x$newvar_mo, keep_synonyms = TRUE, info = FALSE), mo_species(x$newvar_mo, keep_synonyms = TRUE, info = FALSE))
  x$newvar_date <- x[, col_date, drop = TRUE]
  x$newvar_patient_id <- as.character(x[, col_patient_id, drop = TRUE])

@ -358,8 +358,7 @@ first_isolate <- function(x = NULL,
  # remove testcodes
  if (!is.null(testcodes_exclude) && isTRUE(info) && message_not_thrown_before("first_isolate", "excludingtestcodes")) {
    message_("Excluding test codes: ", vector_and(testcodes_exclude, quotes = TRUE),
-      add_fn = font_black,
-      as_note = FALSE
+      add_fn = font_red
    )
  }

@ -372,8 +371,7 @@ first_isolate <- function(x = NULL,
    check_columns_existance(col_specimen, x)
    if (isTRUE(info) && message_not_thrown_before("first_isolate", "excludingspecimen")) {
      message_("Excluding other than specimen group '", specimen_group, "'",
-        add_fn = font_black,
-        as_note = FALSE
+        add_fn = font_red
      )
    }
  }
@ -445,7 +443,7 @@ first_isolate <- function(x = NULL,
  # did find some isolates - add new index numbers of rows
  x$newvar_row_index_sorted <- seq_len(nrow(x))

-  scope.size <- nrow(x[which(x$newvar_row_index_sorted %in% c(row.start + 1:row.end) &
+  scope.size <- nrow(x[which(x$newvar_row_index_sorted %in% seq(row.start, row.end, 1) &
    !is.na(x$newvar_mo)), , drop = FALSE])

  # Analysis of first isolate ----
@ -455,15 +453,13 @@ first_isolate <- function(x = NULL,
        message_("Basing inclusion on key antimicrobials, ",
          ifelse(ignore_I == FALSE, "not ", ""),
          "ignoring I",
-          add_fn = font_black,
-          as_note = FALSE
+          add_fn = font_red
        )
      }
      if (type == "points") {
        message_("Basing inclusion on all antimicrobial results, using a points threshold of ",
          points_threshold,
-          add_fn = font_black,
-          as_note = FALSE
+          add_fn = font_red
        )
      }
    }
@ -471,68 +467,66 @@ first_isolate <- function(x = NULL,

  x$other_pat_or_mo <- !(x$newvar_patient_id == pm_lag(x$newvar_patient_id) & x$newvar_genus_species == pm_lag(x$newvar_genus_species))

-  x$episode_group <- paste(x$newvar_patient_id, x$newvar_genus_species)
-
+  x$newvar_episode_group <- paste(x$newvar_patient_id, x$newvar_genus_species)
+  
  x$more_than_episode_ago <- unlist(
    lapply(
      split(
        x$newvar_date,
-        x$episode_group
+        x$newvar_episode_group
      ),
      is_new_episode,
-      episode_days = episode_days
+      episode_days = episode_days,
+      drop = FALSE
    ),
    use.names = FALSE
  )
-
+  
  if (!is.null(col_keyantimicrobials)) {
-    # with key antibiotics
-    x$other_key_ab <- !antimicrobials_equal(
-      y = x$newvar_key_ab,
-      z = pm_lag(x$newvar_key_ab),
-      type = type,
-      ignore_I = ignore_I,
-      points_threshold = points_threshold
+    # using phenotypes
+    x$different_antibiogram <- !unlist(
+      lapply(
+        split(
+          x$newvar_key_ab,
+          x$newvar_episode_group
+        ),
+        duplicated_antibiogram,
+        points_threshold = points_threshold,
+        ignore_I = ignore_I,
+        type = type
+      ),
+      use.names = FALSE
    )
-    x$newvar_first_isolate <- x$newvar_row_index_sorted >= row.start &
-      x$newvar_row_index_sorted <= row.end &
-      x$newvar_genus_species != "" &
-      (x$other_pat_or_mo | x$more_than_episode_ago | x$other_key_ab)
  } else {
-    # no key antibiotics
-    x$newvar_first_isolate <- x$newvar_row_index_sorted >= row.start &
-      x$newvar_row_index_sorted <= row.end &
-      x$newvar_genus_species != "" &
-      (x$other_pat_or_mo | x$more_than_episode_ago)
+    x$different_antibiogram <- FALSE
  }
-
+  
+  x$newvar_first_isolate <- x$newvar_row_index_sorted >= row.start &
+    x$newvar_row_index_sorted <= row.end &
+    x$newvar_genus_species != "" &
+    (x$other_pat_or_mo | x$more_than_episode_ago | x$different_antibiogram)
+  
+  decimal.mark <- getOption("OutDec")
+  big.mark <- ifelse(decimal.mark != ",", ",", " ")
+  
  # first one as TRUE
  x[row.start, "newvar_first_isolate"] <- TRUE
  # no tests that should be included, or ICU
  if (!is.null(col_testcode)) {
    x[which(x[, col_testcode] %in% tolower(testcodes_exclude)), "newvar_first_isolate"] <- FALSE
  }
-
-  if (!is.null(col_icu)) {
+  if (any(!is.na(x$newvar_is_icu)) && any(x$newvar_is_icu == TRUE, na.rm = TRUE)) {
    if (icu_exclude == TRUE) {
      if (isTRUE(info)) {
-        message_("Excluding ", format(sum(col_icu, na.rm = TRUE), big.mark = " "), " isolates from ICU.",
-          add_fn = font_black,
-          as_note = FALSE
-        )
+        message_("Excluding ", format(sum(x$newvar_is_icu, na.rm = TRUE), decimal.mark = decimal.mark, big.mark = big.mark), " isolates from ICU.",
+                 add_fn = font_red)
      }
-      x[which(col_icu), "newvar_first_isolate"] <- FALSE
+      x[which(x$newvar_is_icu), "newvar_first_isolate"] <- FALSE
    } else if (isTRUE(info)) {
-      message_("Including isolates from ICU.",
-        add_fn = font_black,
-        as_note = FALSE
-      )
+      message_("Including isolates from ICU.")
    }
  }

-  decimal.mark <- getOption("OutDec")
-  big.mark <- ifelse(decimal.mark != ",", ",", " ")
-
  if (isTRUE(info)) {
    # print group name if used in dplyr::group_by()
    cur_group <- import_fn("cur_group", "dplyr", error_on_fail = FALSE)
@ -560,11 +554,12 @@ first_isolate <- function(x = NULL,
  # handle empty microorganisms
  if (any(x$newvar_mo == "UNKNOWN", na.rm = TRUE) && isTRUE(info)) {
    message_(
-      ifelse(include_unknown == TRUE, "Included ", "Excluded "),
+      ifelse(include_unknown == TRUE, "Including ", "Excluding "),
      format(sum(x$newvar_mo == "UNKNOWN", na.rm = TRUE),
        decimal.mark = decimal.mark, big.mark = big.mark
      ),
-      " isolates with a microbial ID 'UNKNOWN' (in column '", font_bold(col_mo), "')"
+      " isolates with a microbial ID 'UNKNOWN' (in column '", font_bold(col_mo), "')",
+      add_fn = font_red
    )
  }
  x[which(x$newvar_mo == "UNKNOWN"), "newvar_first_isolate"] <- include_unknown
@ -572,10 +567,11 @@ first_isolate <- function(x = NULL,
  # exclude all NAs
  if (anyNA(x$newvar_mo) && isTRUE(info)) {
    message_(
-      "Excluded ", format(sum(is.na(x$newvar_mo), na.rm = TRUE),
+      "Excluding ", format(sum(is.na(x$newvar_mo), na.rm = TRUE),
        decimal.mark = decimal.mark, big.mark = big.mark
      ),
-      " isolates with a microbial ID 'NA' (in column '", font_bold(col_mo), "')"
+      " isolates with a microbial ID `NA` (in column '", font_bold(col_mo), "')",
+      add_fn = font_red
    )
  }
  x[which(is.na(x$newvar_mo)), "newvar_first_isolate"] <- FALSE
@ -672,3 +668,48 @@ coerce_method <- function(method) {
  method[method %like% "^(i$|iso)"] <- "isolate-based"
  method
 }
+
+duplicated_antibiogram <- function(antibiogram, points_threshold, ignore_I, type) {
+  if (length(antibiogram) == 1) {
+    # fast return, only 1 isolate
+    return(FALSE)
+  }
+  out <- rep(NA, length(antibiogram))
+  out[1] <- FALSE
+  out[2] <- antimicrobials_equal(antibiogram[1], antibiogram[2],
+                                 ignore_I = ignore_I, points_threshold = points_threshold,
+                                 type = type)
+  if (length(antibiogram) == 2) {
+    # fast return, no further check required
+    return(out)
+  }
+  
+  # sort after the second one (since we already determined AB equality of the first two)
+  original_sort <- c(1, 2, rank(antibiogram[3:length(antibiogram)]) + 2)
+  antibiogram.bak <- antibiogram
+  antibiogram <- c(antibiogram[1:2], sort(antibiogram[3:length(antibiogram)]))
+  
+  # we can skip the duplicates - they are never unique antibiograms of course
+  duplicates <- duplicated(antibiogram)
+  out[3:length(out)][duplicates[3:length(out)] == TRUE] <- TRUE
+  if (all(duplicates[3:length(out)] == TRUE, na.rm = TRUE)) {
+    # fast return, no further check required
+    return(c(out[1:2], rep(TRUE, length(out) - 2)))
+  }
+  
+  for (na in antibiogram[is.na(out)]) {
+    # check if this antibiogram has any change with other antibiograms
+    out[which(antibiogram == na)] <- all(
+      vapply(FUN.VALUE = logical(1),
+             antibiogram[!is.na(out) & antibiogram != na],
+             function(y) antimicrobials_equal(y = y, z = na,
+                                              ignore_I = ignore_I, points_threshold = points_threshold,
+                                              type = type)))
+  }
+  
+  out <- out[original_sort]
+  # rerun duplicated again
+  duplicates <- duplicated(antibiogram.bak)
+  out[duplicates == TRUE] <- TRUE
+  out
+}
--- a/R/g.test.R
+++ b/R/g.test.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/get_episode.R
+++ b/R/get_episode.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -221,11 +221,11 @@ exec_episode <- function(x, episode_days, case_free_days, ...) {

  # running as.double() on a POSIXct object will return its number of seconds since 1970-01-01
  x <- as.double(as.POSIXct(x)) # as.POSIXct() required for Date classes
-
+  
  # since x is now in seconds, get seconds from episode_days as well
  episode_seconds <- episode_days * 60 * 60 * 24
  case_free_seconds <- case_free_days * 60 * 60 * 24
-
+  
  if (length(x) == 1) { # this will also match 1 NA, which is fine
    return(1)
  } else if (length(x) == 2 && all(!is.na(x))) {
@ -241,7 +241,7 @@ exec_episode <- function(x, episode_days, case_free_days, ...) {
    }
  }

-  run_episodes <- function(x, episode_seconds, case_free) {
+  run_episodes <- function(x, episode_sec, case_free_sec) {
    NAs <- which(is.na(x))
    x[NAs] <- 0

@ -250,8 +250,8 @@ exec_episode <- function(x, episode_days, case_free_days, ...) {
    ind <- 1
    indices[ind] <- 1
    for (i in 2:length(x)) {
-      if ((length(episode_seconds) > 0 && (x[i] - start) >= episode_seconds) ||
-        (length(case_free_seconds) > 0 && (x[i] - x[i - 1]) >= case_free_seconds)) {
+      if ((length(episode_sec) > 0 && (x[i] - start) >= episode_sec) ||
+        (length(case_free_sec) > 0 && (x[i] - x[i - 1]) >= case_free_sec)) {
        ind <- ind + 1
        start <- x[i]
      }
--- a/R/ggplot_pca.R
+++ b/R/ggplot_pca.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/ggplot_sir.R
+++ b/R/ggplot_sir.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/guess_ab_col.R
+++ b/R/guess_ab_col.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/italicise_taxonomy.R
+++ b/R/italicise_taxonomy.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/join_microorganisms.R
+++ b/R/join_microorganisms.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/key_antimicrobials.R
+++ b/R/key_antimicrobials.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/kurtosis.R
+++ b/R/kurtosis.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/like.R
+++ b/R/like.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/mdro.R
+++ b/R/mdro.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -52,7 +52,7 @@
 #'
 #' * `guideline = "CMI2012"` (default)
 #'
-#'   Magiorakos AP, Srinivasan A *et al.* "Multidrug-resistant, extensively drug-resistant and pandrug-resistant bacteria: an international expert proposal for interim standard definitions for acquired resistance." Clinical Microbiology and Infection (2012) ([link](https://www.clinicalmicrobiologyandinfection.com/article/S1198-743X(14)61632-3/fulltext))
+#'   Magiorakos AP, Srinivasan A *et al.* "Multidrug-resistant, extensively drug-resistant and pandrug-resistant bacteria: an international expert proposal for interim standard definitions for acquired resistance." Clinical Microbiology and Infection (2012) (\doi{10.1111/j.1469-0691.2011.03570.x})
 #'
 #' * `guideline = "EUCAST3.3"` (or simply `guideline = "EUCAST"`)
 #'
@ -203,7 +203,7 @@ mdro <- function(x = NULL,
  }

  info.bak <- info
-  # don't thrown info's more than once per call
+  # don't throw info's more than once per call
  if (isTRUE(info)) {
    info <- message_not_thrown_before("mdro")
  }
@ -1611,10 +1611,12 @@ mdro <- function(x = NULL,
    function(y) all(is.na(y))
  ))
  if (length(rows_empty) > 0) {
-    cat(font_italic(paste0(" (", length(rows_empty), " isolates had no test results)\n")))
+    if (isTRUE(info.bak)) {
+      cat(font_italic(paste0(" (", length(rows_empty), " isolates had no test results)\n")))
+    }
    x[rows_empty, "MDRO"] <- NA
    x[rows_empty, "reason"] <- "none of the antibiotics have test results"
-  } else {
+  } else if (isTRUE(info.bak)) {
    cat("\n")
  }

--- a/R/mean_amr_distance.R
+++ b/R/mean_amr_distance.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/mic.R
+++ b/R/mic.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -161,11 +161,8 @@ valid_mic_levels <- c(
 #' if (require("ggplot2")) {
 #'   autoplot(mic_data, mo = "E. coli", ab = "cipro", language = "nl") # Dutch
 #' }
-#' if (require("ggplot2")) {
-#'   autoplot(mic_data, mo = "E. coli", ab = "cipro", language = "uk") # Ukrainian
-#' }
 as.mic <- function(x, na.rm = FALSE) {
-  meet_criteria(x, allow_class = c("mic", "character", "numeric", "integer", "factor"), allow_NA = TRUE)
+  meet_criteria(x, allow_NA = TRUE)
  meet_criteria(na.rm, allow_class = "logical", has_length = 1)

  if (is.mic(x)) {
@ -184,6 +181,8 @@ as.mic <- function(x, na.rm = FALSE) {

    # comma to period
    x <- gsub(",", ".", x, fixed = TRUE)
+    # transform scientific notation
+    x[x %like% "[-]?[0-9]+([.][0-9]+)?e[-]?[0-9]+"] <- as.double(x[x %like% "[-]?[0-9]+([.][0-9]+)?e[-]?[0-9]+"])
    # transform Unicode for >= and <=
    x <- gsub("\u2264", "<=", x, fixed = TRUE)
    x <- gsub("\u2265", ">=", x, fixed = TRUE)
@ -462,399 +461,46 @@ quantile.mic <- function(x, probs = seq(0, 1, 0.25), na.rm = FALSE,
  quantile(as.double(x), probs = probs, na.rm = na.rm, names = names, type = type, ...)
 }

-# Math (see ?groupGeneric) ----------------------------------------------
+# Math (see ?groupGeneric) ------------------------------------------------

-#' @method abs mic
 #' @export
-#' @noRd
-abs.mic <- function(x) {
-  abs(as.double(x))
-}
-#' @method sign mic
-#' @export
-#' @noRd
-sign.mic <- function(x) {
-  sign(as.double(x))
-}
-#' @method sqrt mic
-#' @export
-#' @noRd
-sqrt.mic <- function(x) {
-  sqrt(as.double(x))
-}
-#' @method floor mic
-#' @export
-#' @noRd
-floor.mic <- function(x) {
-  floor(as.double(x))
-}
-#' @method ceiling mic
-#' @export
-#' @noRd
-ceiling.mic <- function(x) {
-  ceiling(as.double(x))
-}
-#' @method trunc mic
-#' @export
-#' @noRd
-trunc.mic <- function(x, ...) {
-  trunc(as.double(x), ...)
-}
-#' @method round mic
-#' @export
-#' @noRd
-round.mic <- function(x, digits = 0) {
-  round(as.double(x), digits = digits)
-}
-#' @method signif mic
-#' @export
-#' @noRd
-signif.mic <- function(x, digits = 6) {
-  signif(as.double(x), digits = digits)
-}
-#' @method exp mic
-#' @export
-#' @noRd
-exp.mic <- function(x) {
-  exp(as.double(x))
-}
-#' @method log mic
-#' @export
-#' @noRd
-log.mic <- function(x, base = exp(1)) {
-  log(as.double(x), base = base)
-}
-#' @method log10 mic
-#' @export
-#' @noRd
-log10.mic <- function(x) {
-  log10(as.double(x))
-}
-#' @method log2 mic
-#' @export
-#' @noRd
-log2.mic <- function(x) {
-  log2(as.double(x))
-}
-#' @method expm1 mic
-#' @export
-#' @noRd
-expm1.mic <- function(x) {
-  expm1(as.double(x))
-}
-#' @method log1p mic
-#' @export
-#' @noRd
-log1p.mic <- function(x) {
-  log1p(as.double(x))
-}
-#' @method cos mic
-#' @export
-#' @noRd
-cos.mic <- function(x) {
-  cos(as.double(x))
-}
-#' @method sin mic
-#' @export
-#' @noRd
-sin.mic <- function(x) {
-  sin(as.double(x))
-}
-#' @method tan mic
-#' @export
-#' @noRd
-tan.mic <- function(x) {
-  tan(as.double(x))
-}
-#' @method cospi mic
-#' @export
-#' @noRd
-cospi.mic <- function(x) {
-  cospi(as.double(x))
-}
-#' @method sinpi mic
-#' @export
-#' @noRd
-sinpi.mic <- function(x) {
-  sinpi(as.double(x))
-}
-#' @method tanpi mic
-#' @export
-#' @noRd
-tanpi.mic <- function(x) {
-  tanpi(as.double(x))
-}
-#' @method acos mic
-#' @export
-#' @noRd
-acos.mic <- function(x) {
-  acos(as.double(x))
-}
-#' @method asin mic
-#' @export
-#' @noRd
-asin.mic <- function(x) {
-  asin(as.double(x))
-}
-#' @method atan mic
-#' @export
-#' @noRd
-atan.mic <- function(x) {
-  atan(as.double(x))
-}
-#' @method cosh mic
-#' @export
-#' @noRd
-cosh.mic <- function(x) {
-  cosh(as.double(x))
-}
-#' @method sinh mic
-#' @export
-#' @noRd
-sinh.mic <- function(x) {
-  sinh(as.double(x))
-}
-#' @method tanh mic
-#' @export
-#' @noRd
-tanh.mic <- function(x) {
-  tanh(as.double(x))
-}
-#' @method acosh mic
-#' @export
-#' @noRd
-acosh.mic <- function(x) {
-  acosh(as.double(x))
-}
-#' @method asinh mic
-#' @export
-#' @noRd
-asinh.mic <- function(x) {
-  asinh(as.double(x))
-}
-#' @method atanh mic
-#' @export
-#' @noRd
-atanh.mic <- function(x) {
-  atanh(as.double(x))
-}
-#' @method lgamma mic
-#' @export
-#' @noRd
-lgamma.mic <- function(x) {
-  lgamma(as.double(x))
-}
-#' @method gamma mic
-#' @export
-#' @noRd
-gamma.mic <- function(x) {
-  gamma(as.double(x))
-}
-#' @method digamma mic
-#' @export
-#' @noRd
-digamma.mic <- function(x) {
-  digamma(as.double(x))
-}
-#' @method trigamma mic
-#' @export
-#' @noRd
-trigamma.mic <- function(x) {
-  trigamma(as.double(x))
-}
-#' @method cumsum mic
-#' @export
-#' @noRd
-cumsum.mic <- function(x) {
-  cumsum(as.double(x))
-}
-#' @method cumprod mic
-#' @export
-#' @noRd
-cumprod.mic <- function(x) {
-  cumprod(as.double(x))
-}
-#' @method cummax mic
-#' @export
-#' @noRd
-cummax.mic <- function(x) {
-  cummax(as.double(x))
-}
-#' @method cummin mic
-#' @export
-#' @noRd
-cummin.mic <- function(x) {
-  cummin(as.double(x))
+Math.mic <- function(x, ...) {
+  x <- as.double(x)
+  # set class to numeric, because otherwise NextMethod will be factor (since mic is a factor)
+  .Class <- class(x)
+  NextMethod(.Generic)
 }

-# Ops (see ?groupGeneric) -----------------------------------------------
+# Ops (see ?groupGeneric) -------------------------------------------------

-is_greater <- function(el) {
-  el %like_case% ">[0-9]"
-}
-is_lower <- function(el) {
-  el %like_case% "<[0-9]"
+#' @export
+Ops.mic <- function(e1, e2) {
+  e1 <- as.double(e1)
+  if (!missing(e2)) {
+    # when e1 is `!`, e2 is missing
+    e2 <- as.double(e2)
+  }
+  # set class to numeric, because otherwise NextMethod will be factor (since mic is a factor)
+  .Class <- class(e1)
+  NextMethod(.Generic)
 }

-#' @method + mic
+# Complex (see ?groupGeneric) ---------------------------------------------
+
 #' @export
-#' @noRd
-`+.mic` <- function(e1, e2) {
-  as.double(e1) + as.double(e2)
+Complex.mic <- function(z) {
+  z <- as.double(z)
+  # set class to numeric, because otherwise NextMethod will be factor (since mic is a factor)
+  .Class <- class(z)
+  NextMethod(.Generic)
 }

-#' @method - mic
-#' @export
-#' @noRd
-`-.mic` <- function(e1, e2) {
-  as.double(e1) - as.double(e2)
-}
+# Summary (see ?groupGeneric) ---------------------------------------------

-#' @method * mic
 #' @export
-#' @noRd
-`*.mic` <- function(e1, e2) {
-  as.double(e1) * as.double(e2)
-}
-
-#' @method / mic
-#' @export
-#' @noRd
-`/.mic` <- function(e1, e2) {
-  as.double(e1) / as.double(e2)
-}
-
-#' @method ^ mic
-#' @export
-#' @noRd
-`^.mic` <- function(e1, e2) {
-  as.double(e1)^as.double(e2)
-}
-
-#' @method %% mic
-#' @export
-#' @noRd
-`%%.mic` <- function(e1, e2) {
-  as.double(e1) %% as.double(e2)
-}
-
-#' @method %/% mic
-#' @export
-#' @noRd
-`%/%.mic` <- function(e1, e2) {
-  as.double(e1) %/% as.double(e2)
-}
-
-#' @method & mic
-#' @export
-#' @noRd
-`&.mic` <- function(e1, e2) {
-  as.double(e1) & as.double(e2)
-}
-
-#' @method | mic
-#' @export
-#' @noRd
-`|.mic` <- function(e1, e2) {
-  as.double(e1) | as.double(e2)
-}
-
-#' @method ! mic
-#' @export
-#' @noRd
-`!.mic` <- function(x) {
-  !as.double(x)
-}
-
-#' @method == mic
-#' @export
-#' @noRd
-`==.mic` <- function(e1, e2) {
-  as.double(e1) == as.double(e2)
-}
-
-#' @method != mic
-#' @export
-#' @noRd
-`!=.mic` <- function(e1, e2) {
-  as.double(e1) != as.double(e2)
-}
-
-#' @method < mic
-#' @export
-#' @noRd
-`<.mic` <- function(e1, e2) {
-  as.double(e1) < as.double(e2)
-}
-
-#' @method <= mic
-#' @export
-#' @noRd
-`<=.mic` <- function(e1, e2) {
-  as.double(e1) <= as.double(e2)
-}
-
-#' @method >= mic
-#' @export
-#' @noRd
-`>=.mic` <- function(e1, e2) {
-  as.double(e1) >= as.double(e2)
-}
-
-#' @method > mic
-#' @export
-#' @noRd
-`>.mic` <- function(e1, e2) {
-  as.double(e1) > as.double(e2)
-  # doesn't work...
-  # nolint start
-  # as.double(e1) > as.double(e2) |
-  #   (as.double(e1) == as.double(e2) & is_lower(e2) & !is_lower(e1)) |
-  #   (as.double(e1) == as.double(e2) & is_greater(e1) & !is_greater(e2))
-  # nolint end
-}
-
-# Summary (see ?groupGeneric) -------------------------------------------
-
-#' @method all mic
-#' @export
-#' @noRd
-all.mic <- function(..., na.rm = FALSE) {
-  all(as.double(c(...)), na.rm = na.rm)
-}
-#' @method any mic
-#' @export
-#' @noRd
-any.mic <- function(..., na.rm = FALSE) {
-  any(as.double(c(...)), na.rm = na.rm)
-}
-#' @method sum mic
-#' @export
-#' @noRd
-sum.mic <- function(..., na.rm = FALSE) {
-  sum(as.double(c(...)), na.rm = na.rm)
-}
-#' @method prod mic
-#' @export
-#' @noRd
-prod.mic <- function(..., na.rm = FALSE) {
-  prod(as.double(c(...)), na.rm = na.rm)
-}
-#' @method min mic
-#' @export
-#' @noRd
-min.mic <- function(..., na.rm = FALSE) {
-  min(as.double(c(...)), na.rm = na.rm)
-}
-#' @method max mic
-#' @export
-#' @noRd
-max.mic <- function(..., na.rm = FALSE) {
-  max(as.double(c(...)), na.rm = na.rm)
-}
-#' @method range mic
-#' @export
-#' @noRd
-range.mic <- function(..., na.rm = FALSE) {
-  range(as.double(c(...)), na.rm = na.rm)
+Summary.mic <- function(..., na.rm = FALSE) {
+  # NextMethod() cannot be called from an anonymous function (`...`), so we get() the generic directly:
+  fn <- get(.Generic, envir = .GenericCallEnv)
+  fn(as.double(c(...)),
+     na.rm = na.rm)
 }
--- a/R/mo.R
+++ b/R/mo.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -100,9 +100,9 @@
 #' 6. Berends MS *et al.* (2022). **Trends in Occurrence and Phenotypic Resistance of Coagulase-Negative Staphylococci (CoNS) Found in Human Blood in the Northern Netherlands between 2013 and 2019/** *Micro.rganisms* 10(9), 1801; \doi{10.3390/microorganisms10091801}
 #' 7. `r TAXONOMY_VERSION$LPSN$citation` Accessed from <`r TAXONOMY_VERSION$LPSN$url`> on `r documentation_date(TAXONOMY_VERSION$LPSN$accessed_date)`.
 #' 8. `r TAXONOMY_VERSION$GBIF$citation` Accessed from <`r TAXONOMY_VERSION$GBIF$url`> on `r documentation_date(TAXONOMY_VERSION$GBIF$accessed_date)`.
-#' 9. `r TAXONOMY_VERSION$SNOMED$citation` URL: <`r TAXONOMY_VERSION$SNOMED$url`>
-#' 10. Bartlett A *et al.* (2022). **A comprehensive list of bacterial pathogens infecting humans** *Microbiology* 168:001269; \doi{10.1099/mic.0.001269}
-#' 11. Reimer *et al.* (2022). ***BacDive* in 2022: the knowledge base for standardized bacterial and archaeal data.**  *Nucleic Acids Res.* 2022 Jan 7;50(D1):D741-D746; \doi{10.1093/nar/gkab961}
+#' 9. `r TAXONOMY_VERSION$BacDive$citation` Accessed from <`r TAXONOMY_VERSION$BacDive$url`> on `r documentation_date(TAXONOMY_VERSION$BacDive$accessed_date)`.
+#' 10. `r TAXONOMY_VERSION$SNOMED$citation` URL: <`r TAXONOMY_VERSION$SNOMED$url`>
+#' 11. Bartlett A *et al.* (2022). **A comprehensive list of bacterial pathogens infecting humans** *Microbiology* 168:001269; \doi{10.1099/mic.0.001269}
 #' @export
 #' @return A [character] [vector] with additional class [`mo`]
 #' @seealso [microorganisms] for the [data.frame] that is being used to determine ID's.
@ -134,6 +134,10 @@
 #'   "Ureaplasmium urealytica",
 #'   "Ureaplazma urealitycium"
 #' ))
+#' 
+#' # input will get cleaned up with the input given in the `cleaning_regex` argument,
+#' # which defaults to `mo_cleaning_regex()`:
+#' cat(mo_cleaning_regex(), "\n")
 #'
 #' as.mo("Streptococcus group A")
 #'
@ -169,38 +173,34 @@ as.mo <- function(x,
  meet_criteria(cleaning_regex, allow_class = "character", has_length = 1, allow_NULL = TRUE)
  language <- validate_language(language)
  meet_criteria(info, allow_class = "logical", has_length = 1)
-
+  
  add_MO_lookup_to_AMR_env()
-
-  if (tryCatch(all(x %in% c(AMR_env$MO_lookup$mo, NA)) &&
-    isFALSE(Becker) &&
-    isFALSE(Lancefield), error = function(e) FALSE)) {
+  
+  if (tryCatch(all(x %in% c(AMR_env$MO_lookup$mo, NA)), error = function(e) FALSE) &&
+      isFALSE(Becker) &&
+      isFALSE(Lancefield) &&
+      isTRUE(keep_synonyms)) {
    # don't look into valid MO codes, just return them
    # is.mo() won't work - MO codes might change between package versions
    return(set_clean_class(x, new_class = c("mo", "character")))
  }
-
+  
  # start off with replaced language-specific non-ASCII characters with ASCII characters
  x <- parse_and_convert(x)
  # replace mo codes used in older package versions
  x <- replace_old_mo_codes(x, property = "mo")
  # ignore cases that match the ignore pattern
  x <- replace_ignore_pattern(x, ignore_pattern)
-
+  
  x_lower <- tolower(x)
-
-  complexes <- x[trimws2(x_lower) %like_case% " (complex|group)$"]
-  if (length(complexes) > 0 && identical(cleaning_regex, mo_cleaning_regex()) && !any(AMR_env$MO_lookup$fullname[which(AMR_env$MO_lookup$source == "Added by user")] %like% "(group|complex)", na.rm = TRUE)) {
-    warning_("in `as.mo()`: 'complex' and 'group' were ignored from the input in ", length(complexes), " case", ifelse(length(complexes) > 1, "s", ""), ", as they are currently not supported.\nYou can add your own microorganism with `add_custom_microorganisms()`.", call = FALSE)
-  }
-
+  
  # WHONET: xxx = no growth
  x[x_lower %in% c("", "xxx", "na", "nan")] <- NA_character_
-
+  
  out <- rep(NA_character_, length(x))
-
+  
  # below we use base R's match(), known for powering '%in%', and incredibly fast!
-
+  
  # From reference_df ----
  reference_df <- repair_reference_df(reference_df)
  if (!is.null(reference_df)) {
@ -232,33 +232,33 @@ as.mo <- function(x,
      " for ", vector_and(x[is.na(old) & !is.na(new)]), ". Run `mo_reset_session()` to reset this. This note will be shown once per session for this input."
    )
  }
-
+  
  # For all other input ----
  if (any(is.na(out) & !is.na(x))) {
    # reset uncertainties
    AMR_env$mo_uncertainties <- AMR_env$mo_uncertainties[0, ]
    AMR_env$mo_failures <- NULL
-
+    
    # Laboratory systems: remove (translated) entries like "no growth", "not E. coli", etc.
    x[trimws2(x) %like% translate_into_language("no .*growth", language = language)] <- NA_character_
    x[trimws2(x) %like% paste0("^(", translate_into_language("no|not", language = language), ") ")] <- NA_character_
-
+    
    # groups are in our taxonomic table with a capital G
    x <- gsub(" group( |$)", " Group\\1", x, perl = TRUE)
-
+    
    # run over all unique leftovers
    x_unique <- unique(x[is.na(out) & !is.na(x)])
-
+    
    # set up progress bar
    progress <- progress_ticker(n = length(x_unique), n_min = 10, print = info)
    on.exit(close(progress))
-
+    
    msg <- character(0)
-
+    
    # run it
    x_coerced <- vapply(FUN.VALUE = character(1), x_unique, function(x_search) {
      progress$tick()
-
+      
      # some required cleaning steps
      x_out <- trimws2(x_search)
      # this applies the `cleaning_regex` argument, which defaults to mo_cleaning_regex()
@ -266,46 +266,65 @@ as.mo <- function(x,
      x_out <- trimws2(gsub(" +", " ", x_out, perl = TRUE))
      x_search_cleaned <- x_out
      x_out <- tolower(x_out)
-
+      # when x_search_cleaned are only capitals (such as in codes), make them lowercase to increase matching score
+      x_search_cleaned[x_search_cleaned == toupper(x_search_cleaned)] <- x_out[x_search_cleaned == toupper(x_search_cleaned)]
+      
      # first check if cleaning led to an exact result, case-insensitive
      if (x_out %in% AMR_env$MO_lookup$fullname_lower) {
        return(as.character(AMR_env$MO_lookup$mo[match(x_out, AMR_env$MO_lookup$fullname_lower)]))
      }
-
+      
      # input must not be too short
      if (nchar(x_out) < 3) {
        return("UNKNOWN")
      }
-
+      
      # take out the parts, split by space
      x_parts <- strsplit(gsub("-", " ", x_out, fixed = TRUE), " ", fixed = TRUE)[[1]]
-
+      
      # do a pre-match on first character (and if it contains a space, first chars of first two terms)
      if (length(x_parts) %in% c(2, 3)) {
        # for genus + species + subspecies
-        filtr <- which(AMR_env$MO_lookup$full_first == substr(x_parts[1], 1, 1) & (AMR_env$MO_lookup$species_first == substr(x_parts[2], 1, 1) | AMR_env$MO_lookup$subspecies_first == substr(x_parts[2], 1, 1)))
+        if (nchar(gsub("[^a-z]", "", x_parts[1], perl = TRUE)) <= 3) {
+          filtr <- which(AMR_env$MO_lookup$full_first == substr(x_parts[1], 1, 1) &
+                           (AMR_env$MO_lookup$species_first == substr(x_parts[2], 1, 1) |
+                              AMR_env$MO_lookup$subspecies_first == substr(x_parts[2], 1, 1) |
+                              AMR_env$MO_lookup$subspecies_first == substr(x_parts[3], 1, 1)))
+        } else {
+          filtr <- which(AMR_env$MO_lookup$full_first == substr(x_parts[1], 1, 1) |
+                           AMR_env$MO_lookup$species_first == substr(x_parts[2], 1, 1) |
+                           AMR_env$MO_lookup$subspecies_first == substr(x_parts[2], 1, 1) |
+                           AMR_env$MO_lookup$subspecies_first == substr(x_parts[3], 1, 1))
+        }
      } else if (length(x_parts) > 3) {
-        first_chars <- paste0("(^| )", "[", paste(substr(x_parts, 1, 1), collapse = ""), "]")
+        first_chars <- paste0("(^| )[", paste(substr(x_parts, 1, 1), collapse = ""), "]")
        filtr <- which(AMR_env$MO_lookup$full_first %like_case% first_chars)
+      } else if (nchar(x_out) == 3) {
+        # no space and 3 characters - probably a code such as SAU or ECO
+        msg <<- c(msg, paste0("Input \"", x_search, "\" was assumed to be a microorganism code - tried to match on \"", totitle(substr(x_out, 1, 1)), AMR_env$dots, " ", substr(x_out, 2, 3), AMR_env$dots, "\""))
+        filtr <- which(AMR_env$MO_lookup$fullname_lower %like_case% paste0("(^| )", substr(x_out, 1, 1), ".* ", substr(x_out, 2, 3)))
      } else if (nchar(x_out) == 4) {
        # no space and 4 characters - probably a code such as STAU or ESCO
-        msg <- c(msg, paste0("Input \"", x_search, "\" was assumed to be a microorganism code - tried to match on ", vector_and(c(substr(x_out, 1, 2), substr(x_out, 3, 4)), sort = FALSE)))
+        msg <<- c(msg, paste0("Input \"", x_search, "\" was assumed to be a microorganism code - tried to match on \"", totitle(substr(x_out, 1, 2)), AMR_env$dots, " ", substr(x_out, 3, 4), AMR_env$dots, "\""))
        filtr <- which(AMR_env$MO_lookup$fullname_lower %like_case% paste0("(^| )", substr(x_out, 1, 2), ".* ", substr(x_out, 3, 4)))
      } else if (nchar(x_out) <= 6) {
        # no space and 5-6 characters - probably a code such as STAAUR or ESCCOL
        first_part <- paste0(substr(x_out, 1, 2), "[a-z]*", substr(x_out, 3, 3))
        second_part <- substr(x_out, 4, nchar(x_out))
-        msg <- c(msg, paste0("Input \"", x_search, "\" was assumed to be a microorganism code - tried to match on ", vector_and(c(gsub("[a-z]*", "(...)", first_part, fixed = TRUE), second_part), sort = FALSE)))
+        msg <<- c(msg, paste0("Input \"", x_search, "\" was assumed to be a microorganism code - tried to match on \"", gsub("[a-z]*", AMR_env$dots, totitle(first_part), fixed = TRUE), " ", second_part, AMR_env$dots, "\""))
        filtr <- which(AMR_env$MO_lookup$fullname_lower %like_case% paste0("(^| )", first_part, ".* ", second_part))
      } else {
-        filtr <- which(AMR_env$MO_lookup$full_first == substr(x_out, 1, 1))
+        # for genus or species or subspecies
+        filtr <- which(AMR_env$MO_lookup$full_first == substr(x_parts, 1, 1) |
+                         AMR_env$MO_lookup$species_first == substr(x_parts, 1, 1) |
+                         AMR_env$MO_lookup$subspecies_first == substr(x_parts, 1, 1))
      }
      if (length(filtr) == 0) {
        mo_to_search <- AMR_env$MO_lookup$fullname
      } else {
        mo_to_search <- AMR_env$MO_lookup$fullname[filtr]
      }
-
+      
      AMR_env$mo_to_search <- mo_to_search
      # determine the matching score on the original search value
      m <- mo_matching_score(x = x_search_cleaned, n = mo_to_search)
@ -315,15 +334,19 @@ as.mo <- function(x,
        minimum_matching_score_current <- minimum_matching_score_current / AMR_env$MO_lookup$prevalence[match(mo_to_search, AMR_env$MO_lookup$fullname)]
        # correct back for kingdom
        minimum_matching_score_current <- minimum_matching_score_current / AMR_env$MO_lookup$kingdom_index[match(mo_to_search, AMR_env$MO_lookup$fullname)]
+        minimum_matching_score_current <- pmax(minimum_matching_score_current, m)
+        if (length(x_parts) > 1 && all(m <= 0.55, na.rm = TRUE)) {
+          # if the highest score is 0.5, we have nothing serious - 0.5 is the lowest for pathogenic group 1
+          # make everything NA so the results will get removed below
+          # (we added length(x_parts) > 1 to exclude microbial codes from this rule, such as "STAU")
+          m[seq_len(length(m))] <- NA_real_
+        }
      } else {
+        # minimum_matching_score was set, so remove everything below it
+        m[m < minimum_matching_score] <- NA_real_
        minimum_matching_score_current <- minimum_matching_score
      }
-
-      if (sum(m >= minimum_matching_score_current) > 10) {
-        # at least 10 are left over, make the ones under `m` NA
-        m[m < minimum_matching_score_current] <- NA_real_
-      }
-
+      
      top_hits <- mo_to_search[order(m, decreasing = TRUE, na.last = NA)] # na.last = NA will remove the NAs
      if (length(top_hits) == 0) {
        warning_("No hits found for \"", x_search, "\" with minimum_matching_score = ", ifelse(is.null(minimum_matching_score), paste0("NULL (=", round(min(minimum_matching_score_current, na.rm = TRUE), 3), ")"), minimum_matching_score), ". Try setting this value lower or even to 0.", call = FALSE)
@ -356,12 +379,12 @@ as.mo <- function(x,
      # the actual result:
      as.character(result_mo)
    })
-
+    
    # remove progress bar from console
    close(progress)
    # expand from unique again
    out[is.na(out)] <- x_coerced[match(x[is.na(out)], x_unique)]
-
+    
    # Throw note about uncertainties ----
    if (isTRUE(info) && NROW(AMR_env$mo_uncertainties) > 0) {
      if (message_not_thrown_before("as.mo", "uncertainties", AMR_env$mo_uncertainties$original_input)) {
@ -384,14 +407,14 @@ as.mo <- function(x,
          "Microorganism translation was uncertain for ", examples,
          ". Run `mo_uncertainties()` to review ", plural[2], ", or use `add_custom_microorganisms()` to add custom entries."
        ))
-
+        
        for (m in msg) {
          message_(m)
        }
      }
    }
  } # end of loop over all yet unknowns
-
+  
  # Keep or replace synonyms ----
  lpsn_matches <- AMR_env$MO_lookup$lpsn_renamed_to[match(out, AMR_env$MO_lookup$mo)]
  lpsn_matches[!lpsn_matches %in% AMR_env$MO_lookup$lpsn] <- NA
@ -414,14 +437,14 @@ as.mo <- function(x,
    # keep synonyms is TRUE, so check if any do have synonyms
    warning_("Function `as.mo()` returned ", nr2char(length(unique(AMR_env$mo_renamed$old))), " old taxonomic name", ifelse(length(unique(AMR_env$mo_renamed$old)) > 1, "s", ""), ". Use `as.mo(..., keep_synonyms = FALSE)` to clean the input to currently accepted taxonomic names, or set the R option `AMR_keep_synonyms` to `FALSE`. This warning will be shown once per session.", call = FALSE)
  }
-
+  
  # Apply Becker ----
  if (isTRUE(Becker) || Becker == "all") {
    # warn when species found that are not in:
    # - Becker et al. 2014, PMID 25278577
    # - Becker et al. 2019, PMID 30872103
    # - Becker et al. 2020, PMID 32056452
-
+    
    # comment below code if all staphylococcal species are categorised as CoNS/CoPS
    post_Becker <- paste(
      "Staphylococcus",
@ -430,13 +453,13 @@ as.mo <- function(x,
    if (any(out %in% AMR_env$MO_lookup$mo[match(post_Becker, AMR_env$MO_lookup$fullname)])) {
      if (message_not_thrown_before("as.mo", "becker")) {
        warning_("in `as.mo()`: Becker ", font_italic("et al."), " (2014, 2019, 2020) does not contain these species named after their publication: ",
-          vector_and(font_italic(gsub("Staphylococcus", "S.", post_Becker, fixed = TRUE), collapse = NULL), quotes = FALSE),
-          ". Categorisation to CoNS/CoPS was taken from the original scientific publication(s).",
-          immediate = TRUE, call = FALSE
+                 vector_and(font_italic(gsub("Staphylococcus", "S.", post_Becker, fixed = TRUE), collapse = NULL), quotes = FALSE),
+                 ". Categorisation to CoNS/CoPS was taken from the original scientific publication(s).",
+                 immediate = TRUE, call = FALSE
        )
      }
    }
-
+    
    # 'MO_CONS' and 'MO_COPS' are 'mo' vectors created in R/_pre_commit_hook.R
    out[out %in% MO_CONS] <- "B_STPHY_CONS"
    out[out %in% MO_COPS] <- "B_STPHY_COPS"
@ -444,11 +467,11 @@ as.mo <- function(x,
      out[out == "B_STPHY_AURS"] <- "B_STPHY_COPS"
    }
  }
-
+  
  # Apply Lancefield ----
  if (isTRUE(Lancefield) || Lancefield == "all") {
    # (using `%like_case%` to also match subspecies)
-
+    
    # group A - S. pyogenes
    out[out %like_case% "^B_STRPT_PYGN(_|$)"] <- "B_STRPT_GRPA"
    # group B - S. agalactiae
@ -459,27 +482,27 @@ as.mo <- function(x,
      # group D - all enterococci
      out[out %like_case% "^B_ENTRC(_|$)"] <- "B_STRPT_GRPD"
    }
-    # group F - S. anginosus, incl. S. anginosus anginosus and S. anginosus whileyi
-    out[out %like_case% "^B_STRPT_ANGN(_|$)"] <- "B_STRPT_GRPF"
+    # group F - Milleri group == S. anginosus group, which incl. S. anginosus, S. constellatus, S. intermedius
+    out[out %like_case% "^B_STRPT_(ANGN|CNST|INTR)(_|$)"] <- "B_STRPT_GRPF"
    # group G - S. dysgalactiae and S. canis (though dysgalactiae is also group C and will be matched there)
    out[out %like_case% "^B_STRPT_(DYSG|CANS)(_|$)"] <- "B_STRPT_GRPG"
    # group H - S. sanguinis
    out[out %like_case% "^B_STRPT_SNGN(_|$)"] <- "B_STRPT_GRPH"
-    # group K - S. salivarius, incl. S. salivarius salivariuss and S. salivarius thermophilus
+    # group K - S. salivarius, incl. S. salivarius salivarius and S. salivarius thermophilus
    out[out %like_case% "^B_STRPT_SLVR(_|$)"] <- "B_STRPT_GRPK"
    # group L - only S. dysgalactiae which is also group C & G, so ignore it here
  }
-
+  
  # All unknowns ----
  out[is.na(out) & !is.na(x)] <- "UNKNOWN"
-  AMR_env$mo_failures <- unique(x[out == "UNKNOWN" & !x %in% c("UNKNOWN", "con") & !x %like_case% "^[(]unknown [a-z]+[)]$" & !is.na(x)])
+  AMR_env$mo_failures <- unique(x[out == "UNKNOWN" & !toupper(x) %in% c("UNKNOWN", "CON", "UNK") & !x %like_case% "^[(]unknown [a-z]+[)]$" & !is.na(x)])
  if (length(AMR_env$mo_failures) > 0) {
    warning_("The following input could not be coerced and was returned as \"UNKNOWN\": ", vector_and(AMR_env$mo_failures, quotes = TRUE), ".\nYou can retrieve this list with `mo_failures()`.", call = FALSE)
  }
-
+  
  # Return class ----
  set_clean_class(out,
-    new_class = c("mo", "character")
+                  new_class = c("mo", "character")
  )
 }

@ -502,13 +525,13 @@ mo_uncertainties <- function() {
 mo_renamed <- function() {
  add_MO_lookup_to_AMR_env()
  x <- AMR_env$mo_renamed
-
+  
  x$new <- synonym_mo_to_accepted_mo(x$old)
  mo_old <- AMR_env$MO_lookup$fullname[match(x$old, AMR_env$MO_lookup$mo)]
  mo_new <- AMR_env$MO_lookup$fullname[match(x$new, AMR_env$MO_lookup$mo)]
  ref_old <- AMR_env$MO_lookup$ref[match(x$old, AMR_env$MO_lookup$mo)]
  ref_new <- AMR_env$MO_lookup$ref[match(x$new, AMR_env$MO_lookup$mo)]
-
+  
  df_renamed <- data.frame(
    old = mo_old,
    new = mo_new,
@ -542,14 +565,17 @@ mo_reset_session <- function() {
 #' @rdname as.mo
 #' @export
 mo_cleaning_regex <- function() {
+  parts_to_remove <- c("e?spp([^a-z]+|$)", "e?ssp([^a-z]+|$)", "e?ss([^a-z]+|$)", "e?sp([^a-z]+|$)", "e?subsp", "sube?species", "e?species",
+                       "biovar[a-z]*", "biotype", "serovar[a-z]*", "var([^a-z]+|$)", "serogr.?up[a-z]*",
+                       "titer", "dummy", "Ig[ADEGM]")
  paste0(
    "(",
    "[^A-Za-z- \\(\\)\\[\\]{}]+",
    "|",
    "([({]|\\[).+([})]|\\])",
-    "|",
-    "(^| )(e?spp|e?ssp|e?ss|e?sp|e?subsp|sube?species|biovar|biotype|serovar|var|serogr.?up|e?species)[.]*( |$|(complex|group)$))"
-  )
+    "|(^| )(",
+    paste0(parts_to_remove[order(1 - nchar(parts_to_remove))], collapse = "|"),
+  "))")
 }

 # UNDOCUMENTED METHODS ----------------------------------------------------
@ -557,35 +583,35 @@ mo_cleaning_regex <- function() {
 # will be exported using s3_register() in R/zzz.R
 pillar_shaft.mo <- function(x, ...) {
  add_MO_lookup_to_AMR_env()
-  out <- format(x)
+  out <- trimws(format(x))
  # grey out the kingdom (part until first "_")
  out[!is.na(x)] <- gsub("^([A-Z]+_)(.*)", paste0(font_subtle("\\1"), "\\2"), out[!is.na(x)], perl = TRUE)
  # and grey out every _
  out[!is.na(x)] <- gsub("_", font_subtle("_"), out[!is.na(x)])
-
+  
  # markup NA and UNKNOWN
  out[is.na(x)] <- font_na("  NA")
  out[x == "UNKNOWN"] <- font_na("  UNKNOWN")
-
+  
  # markup manual codes
  out[x %in% AMR_env$MO_lookup$mo & !x %in% AMR::microorganisms$mo] <- font_blue(out[x %in% AMR_env$MO_lookup$mo & !x %in% AMR::microorganisms$mo], collapse = NULL)
-
+  
  df <- tryCatch(get_current_data(arg_name = "x", call = 0),
-    error = function(e) NULL
+                 error = function(e) NULL
  )
  if (!is.null(df)) {
    mo_cols <- vapply(FUN.VALUE = logical(1), df, is.mo)
  } else {
    mo_cols <- NULL
  }
-
+  
  all_mos <- c(AMR_env$MO_lookup$mo, NA)
  if (!all(x %in% all_mos) ||
-    (!is.null(df) && !all(unlist(df[, which(mo_cols), drop = FALSE]) %in% all_mos))) {
+      (!is.null(df) && !all(unlist(df[, which(mo_cols), drop = FALSE]) %in% all_mos))) {
    # markup old mo codes
    out[!x %in% all_mos] <- font_italic(
      font_na(x[!x %in% all_mos],
-        collapse = NULL
+              collapse = NULL
      ),
      collapse = NULL
    )
@ -601,15 +627,22 @@ pillar_shaft.mo <- function(x, ...) {
      call = FALSE
    )
  }
-
+  
+  # add the names to the bugs as mouse-over!
+  if (tryCatch(isTRUE(getExportedValue("ansi_has_hyperlink_support", ns = asNamespace("cli"))()), error = function(e) FALSE)) {
+    out[!x %in% c("UNKNOWN", NA)] <- font_url(url = paste0(x[!x %in% c("UNKNOWN", NA)], ": ",
+                                                           mo_name(x[!x %in% c("UNKNOWN", NA)], keep_synonyms = TRUE)),
+                                              txt = out[!x %in% c("UNKNOWN", NA)])
+  }
+  
  # make it always fit exactly
  max_char <- max(nchar(x))
  if (is.na(max_char)) {
    max_char <- 12
  }
  create_pillar_column(out,
-    align = "left",
-    width = max_char + ifelse(any(x %in% c(NA, "UNKNOWN")), 2, 0)
+                       align = "left",
+                       width = max_char + ifelse(any(x %in% c(NA, "UNKNOWN")), 2, 0)
  )
 }

@ -632,21 +665,21 @@ freq.mo <- function(x, ...) {
    .add_header = list(
      `Gram-negative` = paste0(
        format(sum(grams == "Gram-negative", na.rm = TRUE),
-          big.mark = " ",
-          decimal.mark = "."
+               big.mark = " ",
+               decimal.mark = "."
        ),
        " (", percentage(sum(grams == "Gram-negative", na.rm = TRUE) / length(grams),
-          digits = digits
+                         digits = digits
        ),
        ")"
      ),
      `Gram-positive` = paste0(
        format(sum(grams == "Gram-positive", na.rm = TRUE),
-          big.mark = " ",
-          decimal.mark = "."
+               big.mark = " ",
+               decimal.mark = "."
        ),
        " (", percentage(sum(grams == "Gram-positive", na.rm = TRUE) / length(grams),
-          digits = digits
+                         digits = digits
        ),
        ")"
      ),
@ -800,39 +833,43 @@ rep.mo <- function(x, ...) {
 #' @export
 #' @noRd
 print.mo_uncertainties <- function(x, n = 10, ...) {
+  more_than_50 <- FALSE
  if (NROW(x) == 0) {
-    cat(word_wrap("No uncertainties to show. Only uncertainties of the last call of `as.mo()` or any `mo_*()` function are stored.\n\n", add_fn = font_blue))
+    cat(word_wrap("No uncertainties to show. Only uncertainties of the last call to `as.mo()` or any `mo_*()` function are stored.\n\n", add_fn = font_blue))
    return(invisible(NULL))
+  } else if (NROW(x) > 50) {
+    more_than_50 <- TRUE
+    x <- x[1:50, , drop = FALSE]
  }
-
+  
  cat(word_wrap("Matching scores are based on the resemblance between the input and the full taxonomic name, and the pathogenicity in humans. See `?mo_matching_score`.\n\n", add_fn = font_blue))
-
+  
  add_MO_lookup_to_AMR_env()
-
-  col_red <- function(x) font_rose_bg(font_black(x, collapse = NULL), collapse = NULL)
-  col_orange <- function(x) font_orange_bg(font_black(x, collapse = NULL), collapse = NULL)
-  col_yellow <- function(x) font_yellow_bg(font_black(x, collapse = NULL), collapse = NULL)
-  col_green <- function(x) font_green_bg(font_black(x, collapse = NULL), collapse = NULL)
-
+  
+  col_red <- function(x) font_rose_bg(x, collapse = NULL)
+  col_orange <- function(x) font_orange_bg(x, collapse = NULL)
+  col_yellow <- function(x) font_yellow_bg(x, collapse = NULL)
+  col_green <- function(x) font_green_bg(x, collapse = NULL)
+  
  if (has_colour()) {
    cat(word_wrap("Colour keys: ",
-      col_red(" 0.000-0.499 "),
-      col_orange(" 0.500-0.599 "),
-      col_yellow(" 0.600-0.699 "),
-      col_green(" 0.700-1.000"),
-      add_fn = font_blue
+                  col_red(" 0.000-0.549 "),
+                  col_orange(" 0.550-0.649 "),
+                  col_yellow(" 0.650-0.749 "),
+                  col_green(" 0.750-1.000"),
+                  add_fn = font_blue
    ), font_green_bg(" "), "\n", sep = "")
  }
-
+  
  score_set_colour <- function(text, scores) {
    # set colours to scores
-    text[scores >= 0.7] <- col_green(text[scores >= 0.7])
-    text[scores >= 0.6 & scores < 0.7] <- col_yellow(text[scores >= 0.6 & scores < 0.7])
-    text[scores >= 0.5 & scores < 0.6] <- col_orange(text[scores >= 0.5 & scores < 0.6])
-    text[scores < 0.5] <- col_red(text[scores < 0.5])
+    text[scores >= 0.75] <- col_green(text[scores >= 0.75])
+    text[scores >= 0.65 & scores < 0.75] <- col_yellow(text[scores >= 0.65 & scores < 0.75])
+    text[scores >= 0.55 & scores < 0.65] <- col_orange(text[scores >= 0.55 & scores < 0.65])
+    text[scores < 0.55] <- col_red(text[scores < 0.55])
    text
  }
-
+  
  txt <- ""
  any_maxed_out <- FALSE
  for (i in seq_len(nrow(x))) {
@ -844,15 +881,15 @@ print.mo_uncertainties <- function(x, n = 10, ...) {
      }
      scores <- mo_matching_score(x = x[i, ]$input, n = candidates)
      n_candidates <- length(candidates)
-
+      
      candidates_formatted <- italicise(candidates)
      scores_formatted <- trimws(formatC(round(scores, 3), format = "f", digits = 3))
      scores_formatted <- score_set_colour(scores_formatted, scores)
-
+      
      # sort on descending scores
      candidates_formatted <- candidates_formatted[order(1 - scores)]
      scores_formatted <- scores_formatted[order(1 - scores)]
-
+      
      candidates <- word_wrap(
        paste0(
          "Also matched: ",
@ -870,46 +907,49 @@ print.mo_uncertainties <- function(x, n = 10, ...) {
    } else {
      candidates <- ""
    }
-
+    
    score <- mo_matching_score(
      x = x[i, ]$input,
      n = x[i, ]$fullname
    )
    score_formatted <- trimws(formatC(round(score, 3), format = "f", digits = 3))
    txt <- paste(txt,
-      paste0(
-        paste0(
-          "", strrep(font_grey("-"), times = getOption("width", 100)), "\n",
-          '"', x[i, ]$original_input, '"',
-          " -> ",
-          paste0(
-            font_bold(italicise(x[i, ]$fullname)),
-            " (", x[i, ]$mo, ", ", score_set_colour(score_formatted, score), ")"
-          )
-        ),
-        collapse = "\n"
-      ),
-      # Add note if result was coerced to accepted taxonomic name
-      ifelse(x[i, ]$keep_synonyms == FALSE & x[i, ]$mo %in% AMR_env$MO_lookup$mo[which(AMR_env$MO_lookup$status == "synonym")],
-        paste0(
-          strrep(" ", nchar(x[i, ]$original_input) + 6),
-          font_red(paste0("This old taxonomic name was converted to ", font_italic(AMR_env$MO_lookup$fullname[match(synonym_mo_to_accepted_mo(x[i, ]$mo), AMR_env$MO_lookup$mo)], collapse = NULL), " (", synonym_mo_to_accepted_mo(x[i, ]$mo), ")."), collapse = NULL)
-        ),
-        ""
-      ),
-      candidates,
-      sep = "\n"
+                 paste0(
+                   paste0(
+                     "", strrep(font_grey("-"), times = getOption("width", 100)), "\n",
+                     '"', x[i, ]$original_input, '"',
+                     " -> ",
+                     paste0(
+                       font_bold(italicise(x[i, ]$fullname)),
+                       " (", x[i, ]$mo, ", ", score_set_colour(score_formatted, score), ")"
+                     )
+                   ),
+                   collapse = "\n"
+                 ),
+                 # Add note if result was coerced to accepted taxonomic name
+                 ifelse(x[i, ]$keep_synonyms == FALSE & x[i, ]$mo %in% AMR_env$MO_lookup$mo[which(AMR_env$MO_lookup$status == "synonym")],
+                        paste0(
+                          strrep(" ", nchar(x[i, ]$original_input) + 6),
+                          font_red(paste0("This old taxonomic name was converted to ", font_italic(AMR_env$MO_lookup$fullname[match(synonym_mo_to_accepted_mo(x[i, ]$mo), AMR_env$MO_lookup$mo)], collapse = NULL), " (", synonym_mo_to_accepted_mo(x[i, ]$mo), ")."), collapse = NULL)
+                        ),
+                        ""
+                 ),
+                 candidates,
+                 sep = "\n"
    )
    txt <- gsub("[\n]+", "\n", txt)
    # remove first and last break
    txt <- gsub("(^[\n]|[\n]$)", "", txt)
    txt <- paste0("\n", txt, "\n")
  }
-
+  
  cat(txt)
  if (isTRUE(any_maxed_out)) {
    cat(font_blue(word_wrap("\nOnly the first ", n, " other matches of each record are shown. Run `print(mo_uncertainties(), n = ...)` to view more entries, or save `mo_uncertainties()` to an object.")))
  }
+  if (isTRUE(more_than_50)) {
+    cat(font_blue(word_wrap("\nOnly the first 50 uncertainties are shown. Run `View(mo_uncertainties())` to view all entries, or save `mo_uncertainties()` to an object.")))
+  }
 }

 #' @method print mo_renamed
@ -920,19 +960,19 @@ print.mo_renamed <- function(x, extra_txt = "", n = 25, ...) {
    cat(word_wrap("No renamed taxonomy to show. Only renamed taxonomy of the last call of `as.mo()` or any `mo_*()` function are stored.\n", add_fn = font_blue))
    return(invisible(NULL))
  }
-
+  
  x$ref_old[!is.na(x$ref_old)] <- paste0(" (", gsub("et al.", font_italic("et al."), x$ref_old[!is.na(x$ref_old)], fixed = TRUE), ")")
  x$ref_new[!is.na(x$ref_new)] <- paste0(" (", gsub("et al.", font_italic("et al."), x$ref_new[!is.na(x$ref_new)], fixed = TRUE), ")")
  x$ref_old[is.na(x$ref_old)] <- " (author unknown)"
  x$ref_new[is.na(x$ref_new)] <- " (author unknown)"
-
+  
  rows <- seq_len(min(NROW(x), n))
-
+  
  message_(
    "The following microorganism", ifelse(NROW(x) > 1, "s were", " was"), " taxonomically renamed", extra_txt, ":\n",
    paste0("  ", AMR_env$bullet_icon, " ", font_italic(x$old[rows], collapse = NULL), x$ref_old[rows],
-      "  ->  ", font_italic(x$new[rows], collapse = NULL), x$ref_new[rows],
-      collapse = "\n"
+           "  ->  ", font_italic(x$new[rows], collapse = NULL), x$ref_new[rows],
+           collapse = "\n"
    ),
    ifelse(NROW(x) > n, paste0("\n\nOnly the first ", n, " (out of ", NROW(x), ") are shown. Run `print(mo_renamed(), n = ...)` to view more entries (might be slow), or save `mo_renamed()` to an object."), "")
  )
@ -944,51 +984,52 @@ convert_colloquial_input <- function(x) {
  x.bak <- trimws2(x)
  x <- trimws2(tolower(x))
  out <- rep(NA_character_, length(x))
-
+  
  # Streptococci, like GBS = Group B Streptococci (B_STRPT_GRPB)
-out[x %like_case% "^g[abcdefghijkl]s$"] <- gsub("g([abcdefghijkl])s",
-    "B_STRPT_GRP\\U\\1",
-    x[x %like_case% "^g[abcdefghijkl]s$"],
-    perl = TRUE
+  out[x %like_case% "^g[abcdefghijkl]s$"] <- gsub("g([abcdefghijkl])s",
+                                                  "B_STRPT_GRP\\U\\1",
+                                                  x[x %like_case% "^g[abcdefghijkl]s$"],
+                                                  perl = TRUE
  )
  # Streptococci in different languages, like "estreptococos grupo B"
-  out[x %like_case% "strepto[ck]o[ck].* [abcdefghijkl]$"] <- gsub(".*e?strepto[ck]o[ck].* ([abcdefghijkl])$",
-    "B_STRPT_GRP\\U\\1",
-    x[x %like_case% "strepto[ck]o[ck].* [abcdefghijkl]$"],
-    perl = TRUE
+  out[x %like_case% "strepto[ck]o[ck][a-zA-Z ]* [abcdefghijkl]$"] <- gsub(".*e?strepto[ck]o[ck].* ([abcdefghijkl])$",
+                                                                  "B_STRPT_GRP\\U\\1",
+                                                                  x[x %like_case% "strepto[ck]o[ck][a-zA-Z ]* [abcdefghijkl]$"],
+                                                                  perl = TRUE
  )
  out[x %like_case% "strep[a-z]* group [abcdefghijkl]$"] <- gsub(".* ([abcdefghijkl])$",
-    "B_STRPT_GRP\\U\\1",
-    x[x %like_case% "strep[a-z]* group [abcdefghijkl]$"],
-    perl = TRUE
+                                                                 "B_STRPT_GRP\\U\\1",
+                                                                 x[x %like_case% "strep[a-z]* group [abcdefghijkl]$"],
+                                                                 perl = TRUE
  )
  out[x %like_case% "group [abcdefghijkl] strepto[ck]o[ck]"] <- gsub(".*group ([abcdefghijkl]) strepto[ck]o[ck].*",
-    "B_STRPT_GRP\\U\\1",
-    x[x %like_case% "group [abcdefghijkl] strepto[ck]o[ck]"],
-    perl = TRUE
+                                                                     "B_STRPT_GRP\\U\\1",
+                                                                     x[x %like_case% "group [abcdefghijkl] strepto[ck]o[ck]"],
+                                                                     perl = TRUE
  )
  out[x %like_case% "ha?emoly.*strep"] <- "B_STRPT_HAEM"
+  out[x %like_case% "(strepto.* [abcg, ]{2,4}$)"] <- "B_STRPT_ABCG"
  out[x %like_case% "(strepto.* mil+er+i|^mgs[^a-z]*$)"] <- "B_STRPT_MILL"
  out[x %like_case% "mil+er+i gr"] <- "B_STRPT_MILL"
  out[x %like_case% "((strepto|^s).* viridans|^vgs[^a-z]*$)"] <- "B_STRPT_VIRI"
  out[x %like_case% "(viridans.* (strepto|^s).*|^vgs[^a-z]*$)"] <- "B_STRPT_VIRI"
-
+  
  # Salmonella in different languages, like "Salmonella grupo B"
  out[x %like_case% "salmonella.* [abcdefgh]$"] <- gsub(".*salmonella.* ([abcdefgh])$",
-    "B_SLMNL_GRP\\U\\1",
-    x[x %like_case% "salmonella.* [abcdefgh]$"],
-    perl = TRUE
+                                                        "B_SLMNL_GRP\\U\\1",
+                                                        x[x %like_case% "salmonella.* [abcdefgh]$"],
+                                                        perl = TRUE
  )
  out[x %like_case% "group [abcdefgh] salmonella"] <- gsub(".*group ([abcdefgh]) salmonella*",
-    "B_SLMNL_GRP\\U\\1",
-    x[x %like_case% "group [abcdefgh] salmonella"],
-    perl = TRUE
+                                                           "B_SLMNL_GRP\\U\\1",
+                                                           x[x %like_case% "group [abcdefgh] salmonella"],
+                                                           perl = TRUE
  )
-
+  
  # CoNS/CoPS in different languages (support for German, Dutch, Spanish, Portuguese)
  out[x %like_case% "([ck]oagulas[ea].negatie?[vf]|^[ck]o?ns[^a-z]*$)"] <- "B_STPHY_CONS"
  out[x %like_case% "([ck]oagulas[ea].positie?[vf]|^[ck]o?ps[^a-z]*$)"] <- "B_STPHY_COPS"
-
+  
  # Gram stains
  out[x %like_case% "gram[ -]?neg.*"] <- "B_GRAMN"
  out[x %like_case% "( |^)gram[-]( |$)"] <- "B_GRAMN"
@ -998,22 +1039,29 @@ out[x %like_case% "^g[abcdefghijkl]s$"] <- gsub("g([abcdefghijkl])s",
  out[x %like_case% "anaerob[a-z]+ .*gram[ -]?pos.*"] <- "B_ANAER-POS"
  out[is.na(out) & x %like_case% "anaerob[a-z]+ (micro)?.*organism"] <- "B_ANAER"
  
+  # coryneform bacteria
+  out[x %like_case% "^coryneform"] <- "B_CORYNF"
+  
  # yeasts and fungi
  out[x %like_case% "^yeast?"] <- "F_YEAST"
  out[x %like_case% "^fung(us|i)"] <- "F_FUNGUS"
-
+  
  # trivial names known to the field
  out[x %like_case% "meningo[ck]o[ck]"] <- "B_NESSR_MNNG"
  out[x %like_case% "gono[ck]o[ck]"] <- "B_NESSR_GNRR"
  out[x %like_case% "pneumo[ck]o[ck]"] <- "B_STRPT_PNMN"
+  out[x %like_case% "hacek"] <- "B_HACEK"
+  out[x %like_case% "haemophilus" & x %like_case% "aggregatibacter" & x %like_case% "cardiobacterium" & x %like_case% "eikenella" & x %like_case% "kingella"] <- "B_HACEK"
+  out[x %like_case% "slow.* grow.* mycobact"] <- "B_MYCBC_SGM"
+  out[x %like_case% "rapid.* grow.* mycobact"] <- "B_MYCBC_RGM"

  # unexisting names (con is the WHONET code for contamination)
  out[x %in% c("con", "other", "none", "unknown") | x %like_case% "virus"] <- "UNKNOWN"
-
+  
  # WHONET has a lot of E. coli and Vibrio cholerae names
  out[x %like_case% "escherichia coli"] <- "B_ESCHR_COLI"
  out[x %like_case% "vibrio cholerae"] <- "B_VIBRI_CHLR"
-
+  
  out
 }

@ -1105,7 +1153,7 @@ replace_old_mo_codes <- function(x, property) {
        name <- gsub(" .*", " ", name, fixed = TRUE)
        name <- paste0("^", name)
        results <- AMR_env$MO_lookup$mo[AMR_env$MO_lookup$kingdom %like_case% kingdom &
-          AMR_env$MO_lookup$fullname_lower %like_case% name]
+                                          AMR_env$MO_lookup$fullname_lower %like_case% name]
        if (length(results) > 1) {
          all_direct_matches <<- FALSE
        }
@ -1142,8 +1190,8 @@ replace_old_mo_codes <- function(x, property) {
        "to ", ifelse(n_solved == 1, "a ", ""),
        "currently used MO code", ifelse(n_solved == 1, "", "s"),
        ifelse(n_unsolved > 0,
-          paste0(" and ", n_unsolved, " old MO code", ifelse(n_unsolved == 1, "", "s"), " could not be updated."),
-          "."
+               paste0(" and ", n_unsolved, " old MO code", ifelse(n_unsolved == 1, "", "s"), " could not be updated."),
+               "."
        )
      )
    }
@ -1172,21 +1220,21 @@ repair_reference_df <- function(reference_df) {
  # has valid own reference_df
  reference_df <- reference_df %pm>%
    pm_filter(!is.na(mo))
-
+  
  # keep only first two columns, second must be mo
  if (colnames(reference_df)[1] == "mo") {
    reference_df <- reference_df %pm>% pm_select(2, "mo")
  } else {
    reference_df <- reference_df %pm>% pm_select(1, "mo")
  }
-
+  
  # remove factors, just keep characters
  colnames(reference_df)[1] <- "x"
  reference_df[, "x"] <- as.character(reference_df[, "x", drop = TRUE])
  reference_df[, "mo"] <- as.character(reference_df[, "mo", drop = TRUE])
-
+  
  # some MO codes might be old
-  reference_df[, "mo"] <- as.mo(reference_df[, "mo", drop = TRUE])
+  reference_df[, "mo"] <- as.mo(reference_df[, "mo", drop = TRUE], reference_df = NULL)
  reference_df
 }

@ -1206,10 +1254,10 @@ synonym_mo_to_accepted_mo <- function(x, fill_in_accepted = FALSE) {
  x_lpsn <- AMR_env$MO_lookup$lpsn_renamed_to[match(x, AMR_env$MO_lookup$mo)]
  x_gbif[!x_gbif %in% AMR_env$MO_lookup$gbif] <- NA
  x_lpsn[!x_lpsn %in% AMR_env$MO_lookup$lpsn] <- NA
-
+  
  out <- ifelse(is.na(x_lpsn),
-    AMR_env$MO_lookup$mo[match(x_gbif, AMR_env$MO_lookup$gbif)],
-    AMR_env$MO_lookup$mo[match(x_lpsn, AMR_env$MO_lookup$lpsn)]
+                AMR_env$MO_lookup$mo[match(x_gbif, AMR_env$MO_lookup$gbif)],
+                AMR_env$MO_lookup$mo[match(x_lpsn, AMR_env$MO_lookup$lpsn)]
  )
  if (isTRUE(fill_in_accepted)) {
    x_accepted <- which(AMR_env$MO_lookup$status[match(x, AMR_env$MO_lookup$mo)] == "accepted")
--- a/R/mo_matching_score.R
+++ b/R/mo_matching_score.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -50,7 +50,7 @@
 #' * \eqn{l_n} is the length of \eqn{n};
 #' * \eqn{lev} is the [Levenshtein distance function](https://en.wikipedia.org/wiki/Levenshtein_distance) (counting any insertion as 1, and any deletion or substitution as 2) that is needed to change \eqn{x} into \eqn{n};
 #' * \eqn{p_n} is the human pathogenic prevalence group of \eqn{n}, as described below;
-#' * \eqn{k_n} is the taxonomic kingdom of \eqn{n}, set as Bacteria = 1, Fungi = 2, Protozoa = 3, Archaea = 4, others = 5.
+#' * \eqn{k_n} is the taxonomic kingdom of \eqn{n}, set as Bacteria = 1, Fungi = 1.25, Protozoa = 1.5, Archaea = 2, others = 3.
 #'
 #' The grouping into human pathogenic prevalence \eqn{p} is based on recent work from Bartlett *et al.* (2022, \doi{10.1099/mic.0.001269}) who extensively studied medical-scientific literature to categorise all bacterial species into these groups:
 #'
@ -62,7 +62,7 @@
 #' - Any genus present in the **established** list also has `prevalence = 1.0` in the [microorganisms] data set;
 #' - Any other genus present in the **putative** list has `prevalence = 1.25` in the [microorganisms] data set;
 #' - Any other species or subspecies of which the genus is present in the two aforementioned groups, has `prevalence = 1.5` in the [microorganisms] data set;
-#' - Any *non-bacterial* genus, species or subspecies of which the genus is present in the following list, has `prevalence = 1.5` in the [microorganisms] data set: `r vector_or(MO_PREVALENT_GENERA, quotes = "*")`;
+#' - Any *non-bacterial* genus, species or subspecies of which the genus is present in the following list, has `prevalence = 1.25` in the [microorganisms] data set: `r vector_or(MO_PREVALENT_GENERA, quotes = "*")`;
 #' - All other records have `prevalence = 2.0` in the [microorganisms] data set.
 #'
 #' When calculating the matching score, all characters in \eqn{x} and \eqn{n} are ignored that are other than A-Z, a-z, 0-9, spaces and parentheses.
--- a/R/mo_property.R
+++ b/R/mo_property.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -427,22 +427,13 @@ mo_pathogenicity <- function(x, language = get_AMR_locale(), keep_synonyms = get
  kngd <- AMR_env$MO_lookup$kingdom[match(x.mo, AMR_env$MO_lookup$mo)]
  rank <- AMR_env$MO_lookup$rank[match(x.mo, AMR_env$MO_lookup$mo)]

-  out <- factor(
-    ifelse(prev == 1 & kngd == "Bacteria" & rank != "genus",
-      "Pathogenic",
-      ifelse(prev < 2 & kngd == "Fungi",
-        "Potentially pathogenic",
-        ifelse(prev == 2 & kngd == "Bacteria",
-          "Non-pathogenic",
-          ifelse(kngd == "Bacteria",
-            "Potentially pathogenic",
-            "Unknown"
-          )
-        )
-      )
-    ),
-    levels = c("Pathogenic", "Potentially pathogenic", "Non-pathogenic", "Unknown"),
-    ordered = TRUE
+  out <- factor(case_when_AMR(prev == 1 & kngd == "Bacteria" & rank != "genus" ~ "Pathogenic",
+                              (prev < 2 & kngd == "Fungi") ~ "Potentially pathogenic",
+                              prev == 2 & kngd == "Bacteria" ~ "Non-pathogenic",
+                              kngd == "Bacteria" ~ "Potentially pathogenic",
+                              TRUE ~ "Unknown"),
+                levels = c("Pathogenic", "Potentially pathogenic", "Non-pathogenic", "Unknown"),
+                ordered = TRUE
  )

  load_mo_uncertainties(metadata)
@ -922,26 +913,36 @@ mo_validate <- function(x, property, language, keep_synonyms = keep_synonyms, ..
    Lancefield <- FALSE
  }
  has_Becker_or_Lancefield <- Becker %in% c(TRUE, "all") || Lancefield %in% c(TRUE, "all")
-
-  # get microorganisms data set, but remove synonyms if keep_synonyms is FALSE
-  mo_data_check <- AMR_env$MO_lookup[which(AMR_env$MO_lookup$status %in% if (isTRUE(keep_synonyms)) c("synonym", "accepted") else "accepted"), , drop = FALSE]
-
-  if (all(x %in% c(mo_data_check$mo, NA)) && !has_Becker_or_Lancefield) {
-    # do nothing, just don't run the other if-else's
-  } else if (all(x %in% c(unlist(mo_data_check[[property]]), NA)) && !has_Becker_or_Lancefield) {
-    # no need to do anything, just return it
-    return(x)
+  
+  if (isFALSE(has_Becker_or_Lancefield) && isTRUE(keep_synonyms) && all(x %in% c(AMR_env$MO_lookup$mo, NA))) {
+    # fastest way to get properties
+    if (property == "snomed") {
+      x <- lapply(x, function(y) unlist(AMR_env$MO_lookup$snomed[match(y, AMR_env$MO_lookup$mo)]))
+    } else {
+      x <- AMR_env$MO_lookup[[property]][match(x, AMR_env$MO_lookup$mo)]
+    }
+    
  } else {
-    # we need to get MO codes now
-    x <- replace_old_mo_codes(x, property = property)
-    x <- as.mo(x, language = language, keep_synonyms = keep_synonyms, ...)
-  }
-
-  # get property reeaaally fast using match()
-  if (property == "snomed") {
-    x <- lapply(x, function(y) unlist(AMR_env$MO_lookup$snomed[match(y, AMR_env$MO_lookup$mo)]))
-  } else {
-    x <- AMR_env$MO_lookup[[property]][match(x, AMR_env$MO_lookup$mo)]
+    # get microorganisms data set, but remove synonyms if keep_synonyms is FALSE
+    mo_data_check <- AMR_env$MO_lookup[which(AMR_env$MO_lookup$status %in% if (isTRUE(keep_synonyms)) c("synonym", "accepted") else "accepted"), , drop = FALSE]
+    
+    if (all(x %in% c(mo_data_check$mo, NA)) && !has_Becker_or_Lancefield) {
+      # do nothing, just don't run the other if-else's
+    } else if (all(x %in% c(unlist(mo_data_check[[property]]), NA)) && !has_Becker_or_Lancefield) {
+      # no need to do anything, just return it
+      return(x)
+    } else {
+      # we need to get MO codes now
+      x <- replace_old_mo_codes(x, property = property)
+      x <- as.mo(x, language = language, keep_synonyms = keep_synonyms, ...)
+    }
+    
+    # get property reeaaally fast using match()
+    if (property == "snomed") {
+      x <- lapply(x, function(y) unlist(AMR_env$MO_lookup$snomed[match(y, AMR_env$MO_lookup$mo)]))
+    } else {
+      x <- AMR_env$MO_lookup[[property]][match(x, AMR_env$MO_lookup$mo)]
+    }
  }

  if (property == "mo") {
--- a/R/mo_source.R
+++ b/R/mo_source.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/pca.R
+++ b/R/pca.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/plot.R
+++ b/R/plot.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -40,6 +40,7 @@
 #' @param colours_SIR colours to use for filling in the bars, must be a vector of three values (in the order S, I and R). The default colours are colour-blind friendly.
 #' @param language language to be used to translate 'Susceptible', 'Increased exposure'/'Intermediate' and 'Resistant' - the default is system language (see [get_AMR_locale()]) and can be overwritten by setting the [package option][AMR-options] [`AMR_locale`][AMR-options], e.g. `options(AMR_locale = "de")`, see [translate]. Use `language = NULL` or `language = ""` to prevent translation.
 #' @param expand a [logical] to indicate whether the range on the x axis should be expanded between the lowest and highest value. For MIC values, intermediate values will be factors of 2 starting from the highest MIC value. For disk diameters, the whole diameter range will be filled.
+#' @inheritParams as.sir
 #' @details
 #' The interpretation of "I" will be named "Increased exposure" for all EUCAST guidelines since 2019, and will be named "Intermediate" in all other cases.
 #'
@ -64,7 +65,7 @@
 #' # when providing the microorganism and antibiotic, colours will show interpretations:
 #' plot(some_mic_values, mo = "S. aureus", ab = "ampicillin")
 #' plot(some_disk_values, mo = "Escherichia coli", ab = "cipro")
-#' plot(some_disk_values, mo = "Escherichia coli", ab = "cipro", language = "uk")
+#' plot(some_disk_values, mo = "Escherichia coli", ab = "cipro", language = "nl")
 #'
 #' \donttest{
 #' if (require("ggplot2")) {
@ -93,6 +94,8 @@ plot.mic <- function(x,
                     colours_SIR = c("#3CAEA3", "#F6D55C", "#ED553B"),
                     language = get_AMR_locale(),
                     expand = TRUE,
+                     include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                     breakpoint_type = getOption("AMR_breakpoint_type", "human"),
                     ...) {
  meet_criteria(mo, allow_class = c("mo", "character"), allow_NULL = TRUE)
  meet_criteria(ab, allow_class = c("ab", "character"), allow_NULL = TRUE)
@ -123,7 +126,9 @@ plot.mic <- function(x,
    colours_SIR = colours_SIR,
    fn = as.mic,
    language = language,
-    type = "MIC",
+    method = "MIC",
+    include_PKPD = include_PKPD,
+    breakpoint_type = breakpoint_type,
    ...
  )
  barplot(x,
@ -224,6 +229,8 @@ autoplot.mic <- function(object,
                         colours_SIR = c("#3CAEA3", "#F6D55C", "#ED553B"),
                         language = get_AMR_locale(),
                         expand = TRUE,
+                         include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                         breakpoint_type = getOption("AMR_breakpoint_type", "human"),
                         ...) {
  stop_ifnot_installed("ggplot2")
  meet_criteria(mo, allow_class = c("mo", "character"), allow_NULL = TRUE)
@ -256,7 +263,9 @@ autoplot.mic <- function(object,
    colours_SIR = colours_SIR,
    fn = as.mic,
    language = language,
-    type = "MIC",
+    method = "MIC",
+    include_PKPD = include_PKPD,
+    breakpoint_type = breakpoint_type,
    ...
  )
  df <- as.data.frame(x, stringsAsFactors = TRUE)
@ -327,6 +336,8 @@ plot.disk <- function(x,
                      colours_SIR = c("#3CAEA3", "#F6D55C", "#ED553B"),
                      language = get_AMR_locale(),
                      expand = TRUE,
+                      include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                      breakpoint_type = getOption("AMR_breakpoint_type", "human"),
                      ...) {
  meet_criteria(main, allow_class = "character", has_length = 1, allow_NULL = TRUE)
  meet_criteria(ylab, allow_class = "character", has_length = 1)
@ -357,7 +368,9 @@ plot.disk <- function(x,
    colours_SIR = colours_SIR,
    fn = as.disk,
    language = language,
-    type = "disk",
+    method = "disk",
+    include_PKPD = include_PKPD,
+    breakpoint_type = breakpoint_type,
    ...
  )

@ -458,6 +471,8 @@ autoplot.disk <- function(object,
                          colours_SIR = c("#3CAEA3", "#F6D55C", "#ED553B"),
                          language = get_AMR_locale(),
                          expand = TRUE,
+                          include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                          breakpoint_type = getOption("AMR_breakpoint_type", "human"),
                          ...) {
  stop_ifnot_installed("ggplot2")
  meet_criteria(title, allow_class = "character", allow_NULL = TRUE)
@ -490,7 +505,9 @@ autoplot.disk <- function(object,
    colours_SIR = colours_SIR,
    fn = as.disk,
    language = language,
-    type = "disk",
+    method = "disk",
+    include_PKPD = include_PKPD,
+    breakpoint_type = breakpoint_type,
    ...
  )
  df <- as.data.frame(x, stringsAsFactors = TRUE)
@ -744,38 +761,45 @@ plot_name_of_I <- function(guideline) {
  }
 }

-plot_colours_subtitle_guideline <- function(x, mo, ab, guideline, colours_SIR, fn, language, type, ...) {
+plot_colours_subtitle_guideline <- function(x, mo, ab, guideline, colours_SIR, fn, language, method, breakpoint_type, include_PKPD, ...) {
  guideline <- get_guideline(guideline, AMR::clinical_breakpoints)
+  
+  # store previous interpretations to backup
+  sir_history <- AMR_env$sir_interpretation_history
+  # and clear previous interpretations
+  AMR_env$sir_interpretation_history <- AMR_env$sir_interpretation_history[0, , drop = FALSE]
+  
  if (!is.null(mo) && !is.null(ab)) {
    # interpret and give colour based on MIC values
    mo <- as.mo(mo)
    moname <- mo_name(mo, language = language)
    ab <- as.ab(ab)
    abname <- ab_name(ab, language = language)
-
-    sir <- suppressWarnings(suppressMessages(as.sir(fn(names(x)), mo = mo, ab = ab, guideline = guideline, include_screening = FALSE, include_PKPD = TRUE, ...)))
+    
+    sir <- suppressWarnings(suppressMessages(as.sir(fn(names(x)), mo = mo, ab = ab, guideline = guideline, include_screening = FALSE, include_PKPD = include_PKPD, breakpoint_type = breakpoint_type, ...)))
    guideline_txt <- guideline
    if (all(is.na(sir))) {
-      sir_screening <- suppressWarnings(suppressMessages(as.sir(fn(names(x)), mo = mo, ab = ab, guideline = guideline, include_screening = TRUE, include_PKPD = TRUE, ...)))
+      sir_screening <- suppressWarnings(suppressMessages(as.sir(fn(names(x)), mo = mo, ab = ab, guideline = guideline, include_screening = TRUE, include_PKPD = include_PKPD, breakpoint_type = breakpoint_type, ...)))
      if (!all(is.na(sir_screening))) {
        message_(
-          "Only ", guideline, " ", type, " interpretations found for ",
+          "Only ", guideline, " ", method, " interpretations found for ",
          ab_name(ab, language = NULL, tolower = TRUE), " in ", italicise(moname), " for screening"
        )
        sir <- sir_screening
        guideline_txt <- paste0("(Screen, ", guideline_txt, ")")
      } else {
        message_(
-          "No ", guideline, " ", type, " interpretations found for ",
+          "No ", guideline, " ", method, " interpretations found for ",
          ab_name(ab, language = NULL, tolower = TRUE), " in ", italicise(moname)
        )
-        guideline_txt <- ""
+        guideline_txt <- paste0("(", guideline_txt, ")")
      }
    } else {
      if (isTRUE(list(...)$uti)) {
        guideline_txt <- paste("UTIs,", guideline_txt)
      }
-      guideline_txt <- paste0("(", guideline_txt, ")")
+      ref_tbl <- paste0('"', unique(AMR_env$sir_interpretation_history$ref_table), '"', collapse = "/")
+      guideline_txt <- paste0("(", guideline_txt, ": ", ref_tbl, ")")
    }
    cols <- character(length = length(sir))
    cols[is.na(sir)] <- "#BEBEBE"
@ -787,5 +811,9 @@ plot_colours_subtitle_guideline <- function(x, mo, ab, guideline, colours_SIR, f
    cols <- "#BEBEBE"
    sub <- NULL
  }
+  
+  # restore previous interpretations to backup
+  AMR_env$sir_interpretation_history <- sir_history
+  
  list(cols = cols, count = as.double(x), sub = sub, guideline = guideline)
 }
--- a/R/proportion.R
+++ b/R/proportion.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -46,13 +46,13 @@
 #' @param collapse a [logical] to indicate whether the output values should be 'collapsed', i.e. be merged together into one value, or a character value to use for collapsing
 #' @inheritSection as.sir Interpretation of SIR
 #' @details
+#' **Remember that you should filter your data to let it contain only first isolates!** This is needed to exclude duplicates and to reduce selection bias. Use [first_isolate()] to determine them in your data set with one of the four available algorithms.
+#' 
 #' The function [resistance()] is equal to the function [proportion_R()]. The function [susceptibility()] is equal to the function [proportion_SI()].
 #'
 #' Use [sir_confidence_interval()] to calculate the confidence interval, which relies on [binom.test()], i.e., the Clopper-Pearson method. This function returns a vector of length 2 at default for antimicrobial *resistance*. Change the `side` argument to "left"/"min" or "right"/"max" to return a single value, and change the `ab_result` argument to e.g. `c("S", "I")` to test for antimicrobial *susceptibility*, see Examples.
 #'
-#' **Remember that you should filter your data to let it contain only first isolates!** This is needed to exclude duplicates and to reduce selection bias. Use [first_isolate()] to determine them in your data set with one of the four available algorithms.
-#'
-#' These functions are not meant to count isolates, but to calculate the proportion of resistance/susceptibility. Use the [`count()`][AMR::count()] functions to count isolates. The function [susceptibility()] is essentially equal to `count_susceptible() / count_all()`. *Low counts can influence the outcome - the `proportion` functions may camouflage this, since they only return the proportion (albeit being dependent on the `minimum` argument).*
+#' These functions are not meant to count isolates, but to calculate the proportion of resistance/susceptibility. Use the [`count_*()`][AMR::count()] functions to count isolates. The function [susceptibility()] is essentially equal to [count_susceptible()]` / `[count_all()]. *Low counts can influence the outcome - the `proportion_*()` functions may camouflage this, since they only return the proportion (albeit dependent on the `minimum` argument).*
 #'
 #' The function [proportion_df()] takes any variable from `data` that has an [`sir`] class (created with [as.sir()]) and calculates the proportions S, I, and R. It also supports grouped variables. The function [sir_df()] works exactly like [proportion_df()], but adds the number of isolates.
 #' @section Combination Therapy:
--- a/R/random.R
+++ b/R/random.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -94,13 +94,14 @@ random_sir <- function(size = NULL, prob_SIR = c(0.33, 0.33, 0.33), ...) {
  sample(as.sir(c("S", "I", "R")), size = size, replace = TRUE, prob = prob_SIR)
 }

-random_exec <- function(type, size, mo = NULL, ab = NULL) {
+random_exec <- function(method_type, size, mo = NULL, ab = NULL) {
  df <- AMR::clinical_breakpoints %pm>%
    pm_filter(guideline %like% "EUCAST") %pm>%
    pm_arrange(pm_desc(guideline)) %pm>%
    subset(guideline == max(guideline) &
-      method == type)
-
+      method == method_type &
+      type == "human")
+  
  if (!is.null(mo)) {
    mo_coerced <- as.mo(mo)
    mo_include <- c(
@ -114,7 +115,7 @@ random_exec <- function(type, size, mo = NULL, ab = NULL) {
    if (nrow(df_new) > 0) {
      df <- df_new
    } else {
-      warning_("in `random_", tolower(type), "()`: no rows found that match mo '", mo, "', ignoring argument `mo`")
+      warning_("in `random_", tolower(method_type), "()`: no rows found that match mo '", mo, "', ignoring argument `mo`")
    }
  }

@ -125,22 +126,22 @@ random_exec <- function(type, size, mo = NULL, ab = NULL) {
    if (nrow(df_new) > 0) {
      df <- df_new
    } else {
-      warning_("in `random_", tolower(type), "()`: no rows found that match ab '", ab, "', ignoring argument `ab`")
+      warning_("in `random_", tolower(method_type), "()`: no rows found that match ab '", ab, "' (", ab_name(ab_coerced, tolower = TRUE, language = NULL), "), ignoring argument `ab`")
    }
  }

-  if (type == "MIC") {
+  if (method_type == "MIC") {
    # set range
    mic_range <- c(0.001, 0.002, 0.005, 0.010, 0.025, 0.0625, 0.125, 0.250, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256)

    # get highest/lowest +/- random 1 to 3 higher factors of two
    max_range <- mic_range[min(
      length(mic_range),
-      which(mic_range == max(df$breakpoint_R)) + sample(c(1:3), 1)
+      which(mic_range == max(df$breakpoint_R, na.rm = TRUE)) + sample(c(1:3), 1)
    )]
    min_range <- mic_range[max(
      1,
-      which(mic_range == min(df$breakpoint_S)) - sample(c(1:3), 1)
+      which(mic_range == min(df$breakpoint_S, na.rm = TRUE)) - sample(c(1:3), 1)
    )]

    mic_range_new <- mic_range[mic_range <= max_range & mic_range >= min_range]
@ -156,10 +157,10 @@ random_exec <- function(type, size, mo = NULL, ab = NULL) {
      out[out == max(out)] <- paste0(">=", out[out == max(out)])
    }
    return(out)
-  } else if (type == "DISK") {
+  } else if (method_type == "DISK") {
    set_range <- seq(
-      from = as.integer(min(df$breakpoint_R) / 1.25),
-      to = as.integer(max(df$breakpoint_S) * 1.25),
+      from = as.integer(min(df$breakpoint_R, na.rm = TRUE) / 1.25),
+      to = as.integer(max(df$breakpoint_S, na.rm = TRUE) * 1.25),
      by = 1
    )
    out <- sample(set_range, size = size, replace = TRUE)
--- a/R/resistance_predict.R
+++ b/R/resistance_predict.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/sir.R
+++ b/R/sir.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -30,6 +30,8 @@
 #' Translate MIC and Disk Diffusion to SIR, or Clean Existing SIR Data
 #'
 #' @description Interpret minimum inhibitory concentration (MIC) values and disk diffusion diameters according to EUCAST or CLSI, or clean up existing SIR values. This transforms the input to a new class [`sir`], which is an ordered [factor] with levels `S < I < R`.
+#' 
+#' Currently available **breakpoint guidelines** are EUCAST `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "EUCAST")$guideline)))` and CLSI `r min(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI")$guideline)))`-`r max(as.integer(gsub("[^0-9]", "", subset(AMR::clinical_breakpoints, guideline %like% "CLSI")$guideline)))`, and available **breakpoint types** are `r vector_and(clinical_breakpoints$type)`.
 #'
 #' All breakpoints used for interpretation are publicly available in the [clinical_breakpoints] data set.
 #' @rdname as.sir
@ -43,10 +45,13 @@
 #' @param add_intrinsic_resistance *(only useful when using a EUCAST guideline)* a [logical] to indicate whether intrinsic antibiotic resistance must also be considered for applicable bug-drug combinations, meaning that e.g. ampicillin will always return "R" in *Klebsiella* species. Determination is based on the [intrinsic_resistant] data set, that itself is based on `r format_eucast_version_nr(3.3)`.
 #' @param include_screening a [logical] to indicate that clinical breakpoints for screening are allowed - the default is `FALSE`. Can also be set with the [package option][AMR-options] [`AMR_include_screening`][AMR-options].
 #' @param include_PKPD a [logical] to indicate that PK/PD clinical breakpoints must be applied as a last resort - the default is `TRUE`. Can also be set with the [package option][AMR-options] [`AMR_include_PKPD`][AMR-options].
+#' @param breakpoint_type the type of breakpoints to use, either `r vector_or(clinical_breakpoints$type)`. ECOFF stands for Epidemiological Cut-Off values. The default is `"human"`, which can also be set with the [package option][AMR-options] [`AMR_breakpoint_type`][AMR-options].
 #' @param reference_data a [data.frame] to be used for interpretation, which defaults to the [clinical_breakpoints] data set. Changing this argument allows for using own interpretation guidelines. This argument must contain a data set that is equal in structure to the [clinical_breakpoints] data set (same column names and column types). Please note that the `guideline` argument will be ignored when `reference_data` is manually set.
 #' @param threshold maximum fraction of invalid antimicrobial interpretations of `x`, see *Examples*
 #' @param ... for using on a [data.frame]: names of columns to apply [as.sir()] on (supports tidy selection such as `column1:column4`). Otherwise: arguments passed on to methods.
 #' @details
+#' *Note: The clinical breakpoints in this package were validated through and imported from [WHONET](https://whonet.org) and the public use of this `AMR` package has been endorsed by CLSI and EUCAST, please see [clinical_breakpoints] for more information.*
+#' 
 #' ### How it Works
 #'
 #' The [as.sir()] function works in four ways:
@ -100,7 +105,7 @@
 #'
 #' The function [is_sir_eligible()] returns `TRUE` when a columns contains at most 5% invalid antimicrobial interpretations (not S and/or I and/or R), and `FALSE` otherwise. The threshold of 5% can be set with the `threshold` argument. If the input is a [data.frame], it iterates over all columns and returns a [logical] vector.
 #' @section Interpretation of SIR:
-#' In 2019, the European Committee on Antimicrobial Susceptibility Testing (EUCAST) has decided to change the definitions of susceptibility testing categories S, I, and R as shown below (<https://www.eucast.org/newsiandr/>):
+#' In 2019, the European Committee on Antimicrobial Susceptibility Testing (EUCAST) has decided to change the definitions of susceptibility testing categories S, I, and R as shown below (<https://www.eucast.org/newsiandr>):
 #'
 #' - **S - Susceptible, standard dosing regimen**\cr
 #'   A microorganism is categorised as "Susceptible, standard dosing regimen", when there is a high likelihood of therapeutic success using a standard dosing regimen of the agent.
@ -428,6 +433,7 @@ as.sir.mic <- function(x,
                       reference_data = AMR::clinical_breakpoints,
                       include_screening = getOption("AMR_include_screening", FALSE),
                       include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                       breakpoint_type = getOption("AMR_breakpoint_type", "human"),
                       ...) {
  as_sir_method(
    method_short = "mic",
@ -442,6 +448,7 @@ as.sir.mic <- function(x,
    reference_data = reference_data,
    include_screening = include_screening,
    include_PKPD = include_PKPD,
+    breakpoint_type = breakpoint_type,
    ...
  )
 }
@ -457,6 +464,7 @@ as.sir.disk <- function(x,
                        reference_data = AMR::clinical_breakpoints,
                        include_screening = getOption("AMR_include_screening", FALSE),
                        include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                        breakpoint_type = getOption("AMR_breakpoint_type", "human"),
                        ...) {
  as_sir_method(
    method_short = "disk",
@ -471,6 +479,7 @@ as.sir.disk <- function(x,
    reference_data = reference_data,
    include_screening = include_screening,
    include_PKPD = include_PKPD,
+    breakpoint_type = breakpoint_type,
    ...
  )
 }
@ -486,7 +495,8 @@ as.sir.data.frame <- function(x,
                              add_intrinsic_resistance = FALSE,
                              reference_data = AMR::clinical_breakpoints,
                              include_screening = getOption("AMR_include_screening", FALSE),
-                              include_PKPD = getOption("AMR_include_PKPD", TRUE)) {
+                              include_PKPD = getOption("AMR_include_PKPD", TRUE),
+                              breakpoint_type = getOption("AMR_breakpoint_type", "human")) {
  meet_criteria(x, allow_class = "data.frame") # will also check for dimensions > 0
  meet_criteria(col_mo, allow_class = "character", is_in = colnames(x), allow_NULL = TRUE)
  meet_criteria(guideline, allow_class = "character", has_length = 1)
@ -494,6 +504,9 @@ as.sir.data.frame <- function(x,
  meet_criteria(conserve_capped_values, allow_class = "logical", has_length = 1)
  meet_criteria(add_intrinsic_resistance, allow_class = "logical", has_length = 1)
  meet_criteria(reference_data, allow_class = "data.frame")
+  meet_criteria(include_screening, allow_class = "logical", has_length = 1)
+  meet_criteria(include_PKPD, allow_class = "logical", has_length = 1)
+  meet_criteria(breakpoint_type, allow_class = "character", is_in = reference_data$type, has_length = 1)

  x.bak <- x
  for (i in seq_len(ncol(x))) {
@ -625,6 +638,7 @@ as.sir.data.frame <- function(x,
          reference_data = reference_data,
          include_screening = include_screening,
          include_PKPD = include_PKPD,
+          breakpoint_type = breakpoint_type,
          is_data.frame = TRUE
        )
    } else if (types[i] == "disk") {
@ -642,6 +656,7 @@ as.sir.data.frame <- function(x,
          reference_data = reference_data,
          include_screening = include_screening,
          include_PKPD = include_PKPD,
+          breakpoint_type = breakpoint_type,
          is_data.frame = TRUE
        )
    } else if (types[i] == "sir") {
@ -711,6 +726,7 @@ as_sir_method <- function(method_short,
                          reference_data,
                          include_screening,
                          include_PKPD,
+                          breakpoint_type,
                          ...) {
  meet_criteria(x, allow_NA = TRUE, .call_depth = -2)
  meet_criteria(mo, allow_class = c("mo", "character"), allow_NULL = TRUE, .call_depth = -2)
@ -723,7 +739,14 @@ as_sir_method <- function(method_short,
  meet_criteria(include_screening, allow_class = "logical", has_length = 1, .call_depth = -2)
  meet_criteria(include_PKPD, allow_class = "logical", has_length = 1, .call_depth = -2)
  check_reference_data(reference_data, .call_depth = -2)
+  meet_criteria(breakpoint_type, allow_class = "character", is_in = reference_data$type, has_length = 1, .call_depth = -2)

+  guideline_coerced <- get_guideline(guideline, reference_data)
+  
+  if (message_not_thrown_before("as.sir", "sir_interpretation_history")) {
+    message_("Run `sir_interpretation_history()` afterwards to retrieve a logbook with all the details of the breakpoint interpretations. Note that some microorganisms might not have breakpoints for each antimicrobial drug in ", guideline_coerced, ".\n\n")  
+  }
+  
  # for dplyr's across()
  cur_column_dplyr <- import_fn("cur_column", "dplyr", error_on_fail = FALSE)
  if (!is.null(cur_column_dplyr) && tryCatch(is.data.frame(get_current_data("ab", call = 0)), error = function(e) FALSE)) {
@ -759,7 +782,7 @@ as_sir_method <- function(method_short,
  if (is.null(mo)) {
    stop_("No information was supplied about the microorganisms (missing argument `mo` and no column of class 'mo' found). See ?as.sir.\n\n",
      "To transform certain columns with e.g. mutate(), use `data %>% mutate(across(..., as.sir, mo = x))`, where x is your column with microorganisms.\n",
-      "To tranform all ", method_long, " in a data set, use `data %>% as.sir()` or `data %>% mutate_if(is.", method_short, ", as.sir)`.",
+      "To transform all ", method_long, " in a data set, use `data %>% as.sir()` or `data %>% mutate_if(is.", method_short, ", as.sir)`.",
      call = FALSE
    )
  }
@ -776,11 +799,10 @@ as_sir_method <- function(method_short,
    mo.bak <- mo
  }
  # be sure to take current taxonomy, as the 'clinical_breakpoints' data set only contains current taxonomy
-  mo <- suppressWarnings(suppressMessages(as.mo(mo, keep_synonyms = FALSE, inf0 = FALSE)))
-  guideline_coerced <- get_guideline(guideline, reference_data)
+  mo <- suppressWarnings(suppressMessages(as.mo(mo, keep_synonyms = FALSE, info = FALSE)))
  if (is.na(ab)) {
-    message_("Returning NAs for unknown drug: '", font_bold(ab.bak),
-      "'. Rename this column to a drug name or code, and check the output with `as.ab()`.",
+    message_("Returning NAs for unknown antibiotic: '", font_bold(ab.bak),
+      "'. Rename this column to a valid name or code, and check the output with `as.ab()`.",
      add_fn = font_red,
      as_note = FALSE
    )
@ -817,25 +839,25 @@ as_sir_method <- function(method_short,
      ), agent_name, ")"
    )
  }
-  message_("=> Interpreting ", method_long, " of ", ifelse(isTRUE(list(...)$is_data.frame), "column ", ""),
-    agent_formatted,
-    mo_var_found,
-    " according to ", ifelse(identical(reference_data, AMR::clinical_breakpoints),
-      font_bold(guideline_coerced),
-      "manually defined 'reference_data'"
-    ),
-    "... ",
-    appendLF = FALSE,
-    as_note = FALSE
-  )
-
+  
+  # this intro text will also be printed in the progress bar in the `progress` package is installed
+  intro_txt <- paste0("Interpreting ", method_long, ": ", ifelse(isTRUE(list(...)$is_data.frame), "column ", ""),
+                      agent_formatted,
+                      mo_var_found,
+                      ifelse(identical(reference_data, AMR::clinical_breakpoints),
+                             paste0(", ", font_bold(guideline_coerced)),
+                             ""),
+                      "... ")
+  message_(intro_txt, appendLF = FALSE, as_note = FALSE)
+  
  msg_note <- function(messages) {
+    messages <- unique(messages)
    for (i in seq_len(length(messages))) {
      messages[i] <- word_wrap(extra_indent = 5, messages[i])
    }
    message(
-      font_green(font_bold(" Note:\n")),
-      paste0("   ", font_black(AMR_env$bullet_icon), " ", font_black(messages, collapse = NULL), collapse = "\n")
+      font_yellow_bg(paste0(" NOTE", ifelse(length(messages) > 1, "S", ""), " \n")),
+      paste0("  ", font_black(AMR_env$bullet_icon), " ", font_black(messages, collapse = NULL), collapse = "\n")
    )
  }

@ -857,13 +879,13 @@ as_sir_method <- function(method_short,
    # when as.sir.disk is called directly
    df$values <- as.disk(df$values)
  }
+  df_unique <- unique(df[ , c("mo", "uti"), drop = FALSE])

  rise_warning <- FALSE
  rise_note <- FALSE
  method_coerced <- toupper(method)
-  ab_coerced <- ab
-  mo_coerced <- mo
-
+  ab_coerced <- as.ab(ab)
+  
  if (identical(reference_data, AMR::clinical_breakpoints)) {
    breakpoints <- reference_data %pm>%
      subset(guideline == guideline_coerced & method == method_coerced & ab == ab_coerced)
@ -877,6 +899,9 @@ as_sir_method <- function(method_short,
      subset(method == method_coerced & ab == ab_coerced)
  }

+  breakpoints <- breakpoints %pm>%
+    subset(type == breakpoint_type)
+
  if (isFALSE(include_screening)) {
    # remove screening rules from the breakpoints table
    breakpoints <- breakpoints %pm>%
@ -891,11 +916,12 @@ as_sir_method <- function(method_short,
  msgs <- character(0)
  if (nrow(breakpoints) == 0) {
    # apparently no breakpoints found
-    msg_note(paste0(
-      "No ", method_coerced, " breakpoints available for ",
-      suppressMessages(suppressWarnings(ab_name(ab_coerced, language = NULL, tolower = TRUE))),
-      " (", ab_coerced, ")"
-    ))
+    message(
+      paste0(font_rose_bg(" WARNING "), "\n"),
+      font_black(paste0("  ", AMR_env$bullet_icon, " No ", method_coerced, " breakpoints available for ",
+        suppressMessages(suppressWarnings(ab_name(ab_coerced, language = NULL, tolower = TRUE))),
+        " (", ab_coerced, ").")))
+    
    load_mo_uncertainties(metadata_mo)
    return(rep(NA_sir_, nrow(df)))
  }
@ -904,33 +930,42 @@ as_sir_method <- function(method_short,
    any_is_intrinsic_resistant <- FALSE
    add_intrinsic_resistance_to_AMR_env()
  }
-
+  
+  p <- progress_ticker(n = nrow(df_unique), n_min = 10, title = font_blue(intro_txt), only_bar_percent = TRUE)
+  has_progress_bar <- !is.null(import_fn("progress_bar", "progress", error_on_fail = FALSE)) && nrow(df_unique) >= 10
+  on.exit(close(p))
+  
  # run the rules
-  for (mo_unique in unique(df$mo)) {
-    rows <- which(df$mo == mo_unique)
+  for (i in seq_len(nrow(df_unique))) {
+    p$tick()
+    mo_current <- df_unique[i, "mo", drop = TRUE]
+    uti_current <- df_unique[i, "uti", drop = TRUE]
+    if (is.na(uti_current)) {
+      # no preference, so no filter on UTIs
+      rows <- which(df$mo == mo_current)
+    } else {
+      rows <- which(df$mo == mo_current & df$uti == uti_current)
+    }
    values <- df[rows, "values", drop = TRUE]
-    uti <- df[rows, "uti", drop = TRUE]
    new_sir <- rep(NA_sir_, length(rows))

-    # find different mo properties
-    mo_current_genus <- as.mo(mo_genus(mo_unique, language = NULL))
-    mo_current_family <- as.mo(mo_family(mo_unique, language = NULL))
-    mo_current_order <- as.mo(mo_order(mo_unique, language = NULL))
-    mo_current_class <- as.mo(mo_class(mo_unique, language = NULL))
-    if (mo_genus(mo_unique, language = NULL) == "Staphylococcus") {
-      mo_current_becker <- as.mo(mo_unique, Becker = TRUE)
+    # find different mo properties, as fast as possible
+    mo_current_genus <- AMR_env$MO_lookup$mo[match(AMR_env$MO_lookup$genus[match(mo_current, AMR_env$MO_lookup$mo)], AMR_env$MO_lookup$fullname)]
+    mo_current_family <- AMR_env$MO_lookup$mo[match(AMR_env$MO_lookup$family[match(mo_current, AMR_env$MO_lookup$mo)], AMR_env$MO_lookup$fullname)]
+    mo_current_order <- AMR_env$MO_lookup$mo[match(AMR_env$MO_lookup$order[match(mo_current, AMR_env$MO_lookup$mo)], AMR_env$MO_lookup$fullname)]
+    mo_current_class <- AMR_env$MO_lookup$mo[match(AMR_env$MO_lookup$class[match(mo_current, AMR_env$MO_lookup$mo)], AMR_env$MO_lookup$fullname)]
+    mo_current_rank <- AMR_env$MO_lookup$rank[match(mo_current, AMR_env$MO_lookup$mo)]
+    mo_current_name <- AMR_env$MO_lookup$fullname[match(mo_current, AMR_env$MO_lookup$mo)]
+    if (mo_current %in% AMR::microorganisms.groups$mo) {
+      # get the species group (might be more than 1 entry)
+      mo_current_species_group <- AMR::microorganisms.groups$mo_group[which(AMR::microorganisms.groups$mo == mo_current)]
    } else {
-      mo_current_becker <- mo_unique
+      mo_current_species_group <- NULL
    }
-    if (mo_genus(mo_unique, language = NULL) == "Streptococcus") {
-      mo_current_lancefield <- as.mo(mo_unique, Lancefield = TRUE)
-    } else {
-      mo_current_lancefield <- mo_unique
-    }
-    mo_current_other <- as.mo("UNKNOWN")
+    mo_current_other <- structure("UNKNOWN", class = c("mo", "character"))
    # formatted for notes
-    mo_formatted <- suppressMessages(suppressWarnings(mo_fullname(mo_unique, language = NULL, keep_synonyms = FALSE)))
-    if (!mo_rank(mo_unique) %in% c("kingdom", "phylum", "class", "order")) {
+    mo_formatted <- mo_current_name
+    if (!mo_current_rank %in% c("kingdom", "phylum", "class", "order")) {
      mo_formatted <- font_italic(mo_formatted)
    }
    ab_formatted <- paste0(
@ -942,46 +977,54 @@ as_sir_method <- function(method_short,
    # (this will prefer species breakpoints over order breakpoints)
    breakpoints_current <- breakpoints %pm>%
      subset(mo %in% c(
-        mo_current_genus, mo_current_family,
+        mo_current, mo_current_genus, mo_current_family,
        mo_current_order, mo_current_class,
-        mo_current_becker, mo_current_lancefield,
+        mo_current_species_group,
        mo_current_other
      ))

-    if (any(uti, na.rm = TRUE)) {
+    if (is.na(unique(uti_current))) {
      breakpoints_current <- breakpoints_current %pm>%
+        # this will put UTI = FALSE first, then UTI = TRUE, then UTI = NA
+        pm_arrange(rank_index, uti) # 'uti' is a column in data set 'clinical_breakpoints'  
+    } else if (unique(uti_current) == TRUE) {
+      breakpoints_current <- breakpoints_current %pm>%
+        subset(uti == TRUE) %pm>%
        # be as specific as possible (i.e. prefer species over genus):
-        # the below `pm_desc(uti)` will put `TRUE` on top and FALSE on bottom
-        pm_arrange(rank_index, pm_desc(uti)) # 'uti' is a column in data set 'clinical_breakpoints'
-    } else {
+        pm_arrange(rank_index)
+    } else if (unique(uti_current) == FALSE) {
      breakpoints_current <- breakpoints_current %pm>%
-        # sort UTI = FALSE first, then UTI = TRUE
-        pm_arrange(rank_index, uti)
+        subset(uti == FALSE) %pm>%
+        # be as specific as possible (i.e. prefer species over genus):
+        pm_arrange(rank_index)
    }

    # throw notes for different body sites
-    if (nrow(breakpoints_current) == 1 && all(breakpoints_current$uti == TRUE) && any(uti %in% c(FALSE, NA)) && message_not_thrown_before("as.sir", "uti", ab_coerced)) {
+    site <- breakpoints_current[1L, "site", drop = FALSE] # this is the one we'll take
+    if (is.na(site)) {
+      site <- paste0("an unspecified body site")
+    } else {
+      site <- paste0("body site '", site, "'")
+    }
+    if (nrow(breakpoints_current) == 1 && all(breakpoints_current$uti == TRUE) && any(uti_current %in% c(FALSE, NA)) && message_not_thrown_before("as.sir", "uti", ab_coerced)) {
      # only UTI breakpoints available
      warning_("in `as.sir()`: interpretation of ", font_bold(ab_formatted), " is only available for (uncomplicated) urinary tract infections (UTI) for some microorganisms, thus assuming `uti = TRUE`. See `?as.sir`.")
      rise_warning <- TRUE
-    } else if (nrow(breakpoints_current) > 1 && length(unique(breakpoints_current$site)) > 1 && any(is.na(uti)) && all(c(TRUE, FALSE) %in% breakpoints_current$uti, na.rm = TRUE) && message_not_thrown_before("as.sir", "siteUTI", mo_unique, ab_coerced)) {
+    } else if (nrow(breakpoints_current) > 1 && length(unique(breakpoints_current$site)) > 1 && any(is.na(uti_current)) && all(c(TRUE, FALSE) %in% breakpoints_current$uti, na.rm = TRUE) && message_not_thrown_before("as.sir", "siteUTI", mo_current, ab_coerced)) {
      # both UTI and Non-UTI breakpoints available
-      msgs <- c(msgs, paste0("Breakpoints for UTI ", font_underline("and"), " non-UTI available for ", ab_formatted, " in ", mo_formatted, " - assuming non-UTI. Use argument `uti` to set which isolates are from urine. See `?as.sir`."))
+      msgs <- c(msgs, paste0("Breakpoints for UTI ", font_underline("and"), " non-UTI available for ", ab_formatted, " in ", mo_formatted, " - assuming ", site, ". Use argument `uti` to set which isolates are from urine. See `?as.sir`."))
      breakpoints_current <- breakpoints_current %pm>%
        pm_filter(uti == FALSE)
-    } else if (nrow(breakpoints_current) > 1 && length(unique(breakpoints_current$site)) > 1 && all(breakpoints_current$uti == FALSE, na.rm = TRUE) && message_not_thrown_before("as.sir", "siteOther", mo_unique, ab_coerced)) {
+    } else if (nrow(breakpoints_current) > 1 && length(unique(breakpoints_current$site)) > 1 && all(breakpoints_current$uti == FALSE, na.rm = TRUE) && message_not_thrown_before("as.sir", "siteOther", mo_current, ab_coerced)) {
      # breakpoints for multiple body sites available
-      site <- breakpoints_current[1L, "site", drop = FALSE] # this is the one we'll take
-      if (is.na(site)) {
-        site <- paste0("an unspecified body site")
-      } else {
-        site <- paste0("body site '", site, "'")
-      }
      msgs <- c(msgs, paste0("Multiple breakpoints available for ", ab_formatted, " in ", mo_formatted, " - assuming ", site, "."))
+    } else if (nrow(breakpoints_current) == 0) {
+      # # do not note - it's already in the header before the interpretation starts
+      next
    }
-
+    
    # first check if mo is intrinsic resistant
-    if (isTRUE(add_intrinsic_resistance) && guideline_coerced %like% "EUCAST" && paste(mo_unique, ab_coerced) %in% AMR_env$intrinsic_resistant) {
+    if (isTRUE(add_intrinsic_resistance) && guideline_coerced %like% "EUCAST" && paste(mo_current, ab_coerced) %in% AMR_env$intrinsic_resistant) {
      msgs <- c(msgs, paste0("Intrinsic resistance applied for ", ab_formatted, " in ", mo_formatted, ""))
      new_sir <- rep(as.sir("R"), length(rows))
    } else if (nrow(breakpoints_current) == 0) {
@ -992,10 +1035,10 @@ as_sir_method <- function(method_short,
      breakpoints_current <- breakpoints_current[1L, , drop = FALSE]

      if (any(breakpoints_current$mo == "UNKNOWN", na.rm = TRUE) | any(breakpoints_current$ref_tbl %like% "PK.*PD", na.rm = TRUE)) {
-        msgs <- c(msgs, "(Some) PK/PD breakpoints were applied - use `include_PKPD = FALSE` to prevent this")
+        msgs <- c(msgs, "Some PK/PD breakpoints were applied - use `include_PKPD = FALSE` to prevent this")
      }
      if (any(breakpoints_current$site %like% "screen", na.rm = TRUE) | any(breakpoints_current$ref_tbl %like% "screen", na.rm = TRUE)) {
-        msgs <- c(msgs, "(Some) screening breakpoints were applied - use `include_screening = FALSE` to prevent this")
+        msgs <- c(msgs, "Some screening breakpoints were applied - use `include_screening = FALSE` to prevent this")
      }

      if (method == "mic") {
@ -1029,16 +1072,17 @@ as_sir_method <- function(method_short,
        data.frame(
          datetime = rep(Sys.time(), length(rows)),
          index = rows,
-          ab_input = rep(ab.bak, length(rows)),
-          ab_guideline = rep(ab_coerced, length(rows)),
-          mo_input = rep(mo.bak[match(mo_unique, df$mo)][1], length(rows)),
-          mo_guideline = rep(breakpoints_current[, "mo", drop = TRUE], length(rows)),
-          guideline = rep(guideline_coerced, length(rows)),
-          ref_table = rep(breakpoints_current[, "ref_tbl", drop = TRUE], length(rows)),
-          method = rep(method_coerced, length(rows)),
+          ab_user = rep(ab.bak, length(rows)),
+          mo_user = rep(mo.bak[match(mo_current, df$mo)][1], length(rows)),
+          ab = rep(ab_coerced, length(rows)),
+          mo = rep(breakpoints_current[, "mo", drop = TRUE], length(rows)),
          input = as.double(values),
          outcome = as.sir(new_sir),
+          method = rep(method_coerced, length(rows)),
          breakpoint_S_R = rep(paste0(breakpoints_current[, "breakpoint_S", drop = TRUE], "-", breakpoints_current[, "breakpoint_R", drop = TRUE]), length(rows)),
+          guideline = rep(guideline_coerced, length(rows)),
+          ref_table = rep(breakpoints_current[, "ref_tbl", drop = TRUE], length(rows)),
+          uti = rep(breakpoints_current[, "uti", drop = TRUE], length(rows)),
          stringsAsFactors = FALSE
        )
      )
@ -1046,11 +1090,18 @@ as_sir_method <- function(method_short,

    df[rows, "result"] <- new_sir
  }
+  
+  close(p)

+  # printing messages
+  if (has_progress_bar == TRUE) {
+    # the progress bar has overwritten the intro text, so:
+    message_(intro_txt, appendLF = FALSE, as_note = FALSE)
+  }
  if (isTRUE(rise_warning)) {
-    message(font_yellow(font_bold(" * WARNING *")))
+    message(font_rose_bg(" WARNING "))
  } else if (length(msgs) == 0) {
-    message(font_green(" OK."))
+    message(font_green_bg(" OK "))
  } else {
    msg_note(sort(msgs))
  }
@ -1066,22 +1117,17 @@ as_sir_method <- function(method_short,
 sir_interpretation_history <- function(clean = FALSE) {
  meet_criteria(clean, allow_class = "logical", has_length = 1)

-  out.bak <- AMR_env$sir_interpretation_history
-  out <- out.bak
+  out <- AMR_env$sir_interpretation_history
  if (NROW(out) == 0) {
    message_("No results to return. Run `as.sir()` on MIC values or disk diffusion zones first to see a 'logbook' data set here.")
    return(invisible(NULL))
  }
-  out$ab_guideline <- as.ab(out$ab_guideline)
-  out$mo_guideline <- as.mo(out$mo_guideline)
  out$outcome <- as.sir(out$outcome)
  # keep stored for next use
  if (isTRUE(clean)) {
    AMR_env$sir_interpretation_history <- AMR_env$sir_interpretation_history[0, , drop = FALSE]
-  } else {
-    AMR_env$sir_interpretation_history <- out.bak
  }
-
+  
  # sort descending on time
  out <- out[order(out$datetime, decreasing = TRUE), , drop = FALSE]

@ -1101,7 +1147,11 @@ pillar_shaft.sir <- function(x, ...) {
    out[is.na(x)] <- font_grey("  NA")
    out[x == "S"] <- font_green_bg("  S  ")
    out[x == "I"] <- font_orange_bg("  I  ")
-    out[x == "R"] <- font_red_bg("  R  ")
+    if (is_dark()) {
+      out[x == "R"] <- font_red_bg("  R  ")
+    } else {
+      out[x == "R"] <- font_rose_bg("  R  ")
+    }
  }
  create_pillar_column(out, align = "left", width = 5)
 }
--- a/R/sir_calc.R
+++ b/R/sir_calc.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/sir_df.R
+++ b/R/sir_df.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/skewness.R
+++ b/R/skewness.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/sysdata.rda
+++ b/R/sysdata.rda
--- a/R/translate.R
+++ b/R/translate.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -66,17 +66,12 @@
 #' mo_name("Coagulase-negative Staphylococcus (CoNS)")
 #'
 #' # setting another language
-#' set_AMR_locale("Spanish")
+#' set_AMR_locale("Dutch")
 #' ab_name("Ciprofloxacin")
 #' mo_name("Coagulase-negative Staphylococcus (CoNS)")
 #'
 #' # setting yet another language
-#' set_AMR_locale("Greek")
-#' ab_name("Ciprofloxacin")
-#' mo_name("Coagulase-negative Staphylococcus (CoNS)")
-#'
-#' # setting yet another language
-#' set_AMR_locale("Ukrainian")
+#' set_AMR_locale("German")
 #' ab_name("Ciprofloxacin")
 #' mo_name("Coagulase-negative Staphylococcus (CoNS)")
 #'
@ -266,7 +261,7 @@ translate_into_language <- function(from,
  # a kind of left join to get all results back
  out <- from_unique_translated[match(from.bak, from_unique)]

-  if (!identical(from.bak, out) && get_AMR_locale() == lang && message_not_thrown_before("translation", entire_session = TRUE) && interactive()) {
+  if (!identical(from.bak, out) && get_AMR_locale() == lang && is.null(getOption("AMR_locale", default = NULL)) && message_not_thrown_before("translation", entire_session = TRUE) && interactive()) {
    message(word_wrap(
      "Assuming the ", LANGUAGES_SUPPORTED_NAMES[[lang]]$exonym, " language (",
      LANGUAGES_SUPPORTED_NAMES[[lang]]$endonym, ") for the AMR package. See `set_AMR_locale()` to change this or to silence this once-per-session note.",
--- a/R/vctrs.R
+++ b/R/vctrs.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/whocc.R
+++ b/R/whocc.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/zz_deprecated.R
+++ b/R/zz_deprecated.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/R/zzz.R
+++ b/R/zzz.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -58,34 +58,35 @@ AMR_env$av_previously_coerced <- data.frame(
 AMR_env$sir_interpretation_history <- data.frame(
  datetime = Sys.time()[0],
  index = integer(0),
-  ab_input = character(0),
-  ab_guideline = set_clean_class(character(0), c("ab", "character")),
-  mo_input = character(0),
-  mo_guideline = set_clean_class(character(0), c("mo", "character")),
-  guideline = character(0),
-  ref_table = character(0),
-  method = character(0),
+  ab_user = character(0),
+  mo_user = character(0),
+  ab = set_clean_class(character(0), c("ab", "character")),
+  mo = set_clean_class(character(0), c("mo", "character")),
  input = double(0),
  outcome = NA_sir_[0],
+  method = character(0),
  breakpoint_S_R = character(0),
+  guideline = character(0),
+  ref_table = character(0),
  stringsAsFactors = FALSE
 )
+
 AMR_env$custom_ab_codes <- character(0)
 AMR_env$custom_mo_codes <- character(0)
 AMR_env$is_dark_theme <- NULL
+AMR_env$chmatch <- import_fn("chmatch", "data.table", error_on_fail = FALSE)
+AMR_env$chin <- import_fn("%chin%", "data.table", error_on_fail = FALSE)

 # determine info icon for messages
-utf8_supported <- isTRUE(base::l10n_info()$`UTF-8`)
-is_latex <- tryCatch(import_fn("is_latex_output", "knitr", error_on_fail = FALSE)(),
-  error = function(e) FALSE
-)
-if (utf8_supported && !is_latex) {
-  # \u2139 is a symbol officially named 'information source'
-  AMR_env$info_icon <- "\u2139"
-  AMR_env$bullet_icon <- "\u2022"
+if (pkg_is_available("cli")) {
+  # let cli do the determination of supported symbols
+  AMR_env$info_icon <- import_fn("symbol", "cli")$info
+  AMR_env$bullet_icon <- import_fn("symbol", "cli")$bullet
+  AMR_env$dots <- import_fn("symbol", "cli")$ellipsis
 } else {
  AMR_env$info_icon <- "i"
  AMR_env$bullet_icon <- "*"
+  AMR_env$dots <- "..."
 }

 .onLoad <- function(lib, pkg) {
@ -184,7 +185,7 @@ if (utf8_supported && !is_latex) {
    try(loadNamespace("tibble"), silent = TRUE)
  }

-  # reference data - they have additional to improve algorithm speed
+  # reference data - they have additional data to improve algorithm speed
  # they cannot be part of R/sysdata.rda since CRAN thinks it would make the package too large (+3 MB)
  AMR_env$AB_lookup <- cbind(AMR::antibiotics, AB_LOOKUP)
  AMR_env$AV_lookup <- cbind(AMR::antivirals, AV_LOOKUP)
--- a/_pkgdown.yml
+++ b/_pkgdown.yml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -70,9 +70,9 @@ home:
 navbar:
  title: "AMR (for R)"
  left:
-    - text: "Home"
-      icon: "fa-home"
-      href: "index.html"
+    # - text: "Home"
+    #   icon: "fa-home"
+    #   href: "index.html"
    - text: "How to"
      icon: "fa-question-circle"
      menu:
@ -100,9 +100,9 @@ navbar:
      - text: "Work with WHONET Data"
        icon: "fa-globe-americas"
        href: "articles/WHONET.html"
-      - text: "Import Data From SPSS/SAS/Stata"
-        icon: "fa-file-upload"
-        href: "articles/SPSS.html"
+      # - text: "Import Data From SPSS/SAS/Stata"
+      #   icon: "fa-file-upload"
+      #   href: "articles/SPSS.html"
      - text: "Apply Eucast Rules"
        icon: "fa-exchange-alt"
        href: "articles/EUCAST.html"
@ -115,21 +115,42 @@ navbar:
      - text: "Get Properties of an Antiviral Drug"
        icon: "fa-capsules"
        href: "reference/av_property.html" # reference instead of an article
+    - text: "With other pkgs"
+      icon: "fa-layer-group"
+      menu:
+      - text: "AMR & dplyr/tidyverse"
+        icon: "fa-layer-group"
+        href: "articles/other_pkg.html"
+      - text: "AMR & data.table"
+        icon: "fa-layer-group"
+        href: "articles/other_pkg.html"
+      - text: "AMR & tidymodels"
+        icon: "fa-layer-group"
+        href: "articles/other_pkg.html"
+      - text: "AMR & base R"
+        icon: "fa-layer-group"
+        href: "articles/other_pkg.html"
    - text: "Manual"
      icon: "fa-book-open"
      href: "reference/index.html"
    - text: "Authors"
      icon: "fa-users"
      href: "authors.html"
+  right:
    - text: "Changelog"
      icon: "far fa-newspaper"
      href: "news/index.html"
-  right:
    - text: "Source Code"
      icon: "fab fa-github"
      href: "https://github.com/msberends/AMR"

 reference:
+  - title: "Introduction to the package"
+    desc: >
+      Please find the introduction to (and some general information about) our package here.
+    contents:
+    - "`AMR`"
+    
  - title: "Preparing data: microorganisms"
    desc: >
      These functions are meant to get taxonomically valid properties of microorganisms from any input, but
@ -214,10 +235,10 @@ reference:
      Some pages about our package and its external sources. Be sure to read our [How To's](./../articles/index.html)
      for more information about how to work with functions in this package.
    contents:
-    - "`AMR`"
    - "`example_isolates`"
    - "`microorganisms`"
    - "`microorganisms.codes`"
+    - "`microorganisms.groups`"
    - "`antibiotics`"
    - "`intrinsic_resistant`"
    - "`dosage`"
--- a/codecov.yml
+++ b/codecov.yml
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/cran-comments.md
+++ b/cran-comments.md
@ -1,5 +1,9 @@
+**On the 15th of October, 2023, we received an email from Prof Ripley about an issue in UTF-8 strings in our documentation. This version contains a fix to this issue.**
+
+Previous comments:
+
 As with all previous >20 releases, some CHECKs might return a NOTE for *just* hitting the installation size limit, though its size has been brought down to a minimum in collaboration with CRAN maintainers previously.

-We consider this a high-impact package: it was published in the Journal of Statistical Software (2022), is including in a CRAN Task View (Epidemiology), and is according to download stats used in almost all countries in the world. If there is anything to note, please let us know up-front without directly archiving the current version. That said, we continually unit test our package extensively and have no reason to assume that anything is wrong.
+We consider this a high-impact package: it was published in the Journal of Statistical Software (2022), is included in a CRAN Task View (Epidemiology), and is according to download stats used in almost all countries in the world. If there is anything to note, please let us know up-front without directly archiving the current version. That said, we continually unit test our package extensively and have no reason to assume that anything is wrong.

 Thanks for maintaining and hosting CRAN! It's empowering R and its use enormously!
--- a/data-raw/Dosages_v_13.0_Breakpoint_Tables.pdf
+++ b/data-raw/Dosages_v_13.0_Breakpoint_Tables.pdf
--- a/data-raw/Dosages_v_13.0_Breakpoint_Tables.xlsx
+++ b/data-raw/Dosages_v_13.0_Breakpoint_Tables.xlsx
--- a/data-raw/Loinc.csv
+++ b/data-raw/Loinc.csv
--- a/data-raw/Species
+++ b/data-raw/Species
--- a/data-raw/_language_update.R
+++ b/data-raw/_language_update.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
--- a/data-raw/_pre_commit_hook.R
+++ b/data-raw/_pre_commit_hook.R
@ -1,15 +1,15 @@
 # ==================================================================== #
-# TITLE                                                                #
+# TITLE:                                                               #
 # AMR: An R Package for Working with Antimicrobial Resistance Data     #
 #                                                                      #
-# SOURCE                                                               #
+# SOURCE CODE:                                                         #
 # https://github.com/msberends/AMR                                     #
 #                                                                      #
-# CITE AS                                                              #
+# PLEASE CITE THIS SOFTWARE AS:                                        #
 # Berends MS, Luz CF, Friedrich AW, Sinha BNM, Albers CJ, Glasner C    #
 # (2022). AMR: An R Package for Working with Antimicrobial Resistance  #
 # Data. Journal of Statistical Software, 104(3), 1-31.                 #
-# doi:10.18637/jss.v104.i03                                            #
+# https://doi.org/10.18637/jss.v104.i03                                #
 #                                                                      #
 # Developed at the University of Groningen and the University Medical  #
 # Center Groningen in The Netherlands, in collaboration with many      #
@ -365,7 +365,7 @@ if (changed_md5(clin_break)) {
  usethis::ui_info(paste0("Saving {usethis::ui_value('clinical_breakpoints')} to {usethis::ui_value('data-raw/')}"))
  write_md5(clin_break)
  try(saveRDS(clin_break, "data-raw/clinical_breakpoints.rds", version = 2, compress = "xz"), silent = TRUE)
-  try(write.table(clin_break, "data-raw/clinical_breakpoints.txt", sep = "\t", na = "", row.names = FALSE), silent = TRUE)
+  try(write.table(clinical_breakpoints, "data-raw/clinical_breakpoints.txt", sep = "\t", na = "", row.names = FALSE), silent = TRUE)
  try(haven::write_xpt(clin_break, "data-raw/clinical_breakpoints.xpt"), silent = TRUE)
  try(haven::write_sav(clin_break, "data-raw/clinical_breakpoints.sav"), silent = TRUE)
  try(haven::write_dta(clin_break, "data-raw/clinical_breakpoints.dta"), silent = TRUE)
@ -392,6 +392,32 @@ if (changed_md5(microorganisms)) {
  try(arrow::write_parquet(microorganisms, "data-raw/microorganisms.parquet"), silent = TRUE)
 }

+if (changed_md5(microorganisms.codes)) {
+  usethis::ui_info(paste0("Saving {usethis::ui_value('microorganisms.codes')} to {usethis::ui_value('data-raw/')}"))
+  write_md5(microorganisms.codes)
+  try(saveRDS(microorganisms.codes, "data-raw/microorganisms.codes.rds", version = 2, compress = "xz"), silent = TRUE)
+  try(write.table(microorganisms.codes, "data-raw/microorganisms.codes.txt", sep = "\t", na = "", row.names = FALSE), silent = TRUE)
+  try(haven::write_xpt(microorganisms.codes, "data-raw/microorganisms.codes.xpt"), silent = TRUE)
+  try(haven::write_sav(microorganisms.codes, "data-raw/microorganisms.codes.sav"), silent = TRUE)
+  try(haven::write_dta(microorganisms.codes, "data-raw/microorganisms.codes.dta"), silent = TRUE)
+  try(openxlsx::write.xlsx(microorganisms.codes, "data-raw/microorganisms.codes.xlsx"), silent = TRUE)
+  try(arrow::write_feather(microorganisms.codes, "data-raw/microorganisms.codes.feather"), silent = TRUE)
+  try(arrow::write_parquet(microorganisms.codes, "data-raw/microorganisms.codes.parquet"), silent = TRUE)
+}
+
+if (changed_md5(microorganisms.groups)) {
+  usethis::ui_info(paste0("Saving {usethis::ui_value('microorganisms.groups')} to {usethis::ui_value('data-raw/')}"))
+  write_md5(microorganisms.groups)
+  try(saveRDS(microorganisms.groups, "data-raw/microorganisms.groups.rds", version = 2, compress = "xz"), silent = TRUE)
+  try(write.table(microorganisms.groups, "data-raw/microorganisms.groups.txt", sep = "\t", na = "", row.names = FALSE), silent = TRUE)
+  try(haven::write_xpt(microorganisms.groups, "data-raw/microorganisms.groups.xpt"), silent = TRUE)
+  try(haven::write_sav(microorganisms.groups, "data-raw/microorganisms.groups.sav"), silent = TRUE)
+  try(haven::write_dta(microorganisms.groups, "data-raw/microorganisms.groups.dta"), silent = TRUE)
+  try(openxlsx::write.xlsx(microorganisms.groups, "data-raw/microorganisms.groups.xlsx"), silent = TRUE)
+  try(arrow::write_feather(microorganisms.groups, "data-raw/microorganisms.groups.feather"), silent = TRUE)
+  try(arrow::write_parquet(microorganisms.groups, "data-raw/microorganisms.groups.parquet"), silent = TRUE)
+}
+
 ab <- dplyr::mutate_if(antibiotics, ~ !is.numeric(.), as.character)
 if (changed_md5(ab)) {
  usethis::ui_info(paste0("Saving {usethis::ui_value('antibiotics')} to {usethis::ui_value('data-raw/')}"))
--- a/data-raw/ab.md5
+++ b/data-raw/ab.md5
@ -1 +1 @@
-8bf97fd5f1d8d82486902d05916ebca0
+3d8c509ec95d61889cae83af43b0e6b7
--- a/data-raw/antibiotics.dta
+++ b/data-raw/antibiotics.dta
--- a/data-raw/antibiotics.feather
+++ b/data-raw/antibiotics.feather
--- a/data-raw/antibiotics.parquet
+++ b/data-raw/antibiotics.parquet
--- a/data-raw/antibiotics.rds
+++ b/data-raw/antibiotics.rds
--- a/data-raw/antibiotics.sas
+++ b/data-raw/antibiotics.sas
--- a/data-raw/antibiotics.sav
+++ b/data-raw/antibiotics.sav
--- a/data-raw/antibiotics.txt
+++ b/data-raw/antibiotics.txt
@ -3,256 +3,256 @@
 "ACM"	6450012	"Acetylmidecamycin"	"Macrolides/lincosamides"	"NA"			""	""					""
 "ASP"	49787020	"Acetylspiramycin"	"Macrolides/lincosamides"	"NA"			""	"acetylspiramycin,foromacidin b,spiramycin ii"					""
 "ALS"	8954	"Aldesulfone sodium"	"Other antibacterials"	"J04BA03"	"Drugs for treatment of lepra"	"Drugs for treatment of lepra"	""	"adesulfone sodium,aldapsone,aldesulfona sodica,aldesulfone,aldesulfone sodique,aldesulfone sodium,aldesulphone sodium,diamidin,diasone,diasone sodium,diazon,novotrone,sodium aldesulphone,sodium sulfoxone,sulfoxone sodium"	0.33	"g"			""
-"AMK"	37768	"Amikacin"	"Aminoglycosides"	"D06AX12,J01GB06,S01AA21"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"ak,ami,amik,amk,an"	"amicacin,amikacillin,amikacin,amikacin base,amikacin dihydrate,amikacin free base,amikacin sulfate,amikacina,amikacine,amikacinum,amikavet,amikin,amiklin,amikozit,amukin,arikace,arikayce liposomal,briclin,kaminax,lukadin,mikavir,pierami,potentox"			1	"g"	"13546-7,15098-7,17798-0,31097-9,31098-7,31099-5,3319-1,3320-9,3321-7,35669-1,50802-8,50803-6,56628-1,59378-0,80972-3"
+"AMK"	37768	"Amikacin"	"Aminoglycosides"	"D06AX12,J01GB06,S01AA21"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"ak,ami,amik,amk,an"	"amicacin,amikacillin,amikacin,amikacin base,amikacin dihydrate,amikacin free base,amikacin sulfate,amikacina,amikacine,amikacinum,amikavet,amikin,amiklin,amikozit,amukin,arikace,arikayce liposomal,briclin,kaminax,lukadin,mikavir,pierami,potentox"			1	"g"	"101493-5,11-7,12-5,13-3,13546-7,14-1,15098-7,17798-0,18860-7,20373-7,23624-0,25174-4,25175-1,25176-9,25177-7,25178-5,25179-3,31097-9,31098-7,31099-5,3319-1,3320-9,3321-7,35669-1,42642-9,48169-7,50802-8,50803-6,56628-1,59378-0,60564-2,60565-9,6975-7,80972-3,89484-0"
 "AKF"		"Amikacin/fosfomycin"	"Aminoglycosides"	"NA"			""	""					""
-"AMX"	33613	"Amoxicillin"	"Beta-lactams/penicillins"	"J01CA04"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"ac,amox,amx"	"actimoxi,amoclen,amolin,amopen,amopenixin,amoxibiotic,amoxicaps,amoxicilina,amoxicillin,amoxicillin hydrate,amoxicilline,amoxicillinum,amoxiden,amoxil,amoxivet,amoxy,amoxycillin,amoxyke,anemolin,aspenil,atoksilin,biomox,bristamox,cemoxin,clamoxyl,damoxy,delacillin,demoksil,dispermox,efpenix,flemoxin,hiconcil,histocillin,hydroxyampicillin,ibiamox,imacillin,lamoxy,largopen,metafarma capsules,metifarma capsules,moksilin,moxacin,moxatag,ospamox,pamoxicillin,piramox,promoxil,remoxil,robamox,sawamox pm,tolodina,topramoxin,unicillin,utimox,vetramox"	1.5	"g"	3	"g"	"16365-9,25274-2,3344-9,80133-2"
+"AMX"	33613	"Amoxicillin"	"Beta-lactams/penicillins"	"J01CA04"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"ac,amox,amx"	"actimoxi,amoclen,amolin,amopen,amopenixin,amoxibiotic,amoxicaps,amoxicilina,amoxicillin,amoxicillin hydrate,amoxicilline,amoxicillinum,amoxiden,amoxil,amoxivet,amoxy,amoxycillin,amoxyke,anemolin,aspenil,atoksilin,biomox,bristamox,cemoxin,clamoxyl,damoxy,delacillin,demoksil,dispermox,efpenix,flemoxin,hiconcil,histocillin,hydroxyampicillin,ibiamox,imacillin,lamoxy,largopen,metafarma capsules,metifarma capsules,moksilin,moxacin,moxatag,ospamox,pamoxicillin,piramox,promoxil,remoxil,robamox,sawamox pm,tolodina,topramoxin,unicillin,utimox,vetramox"	1.5	"g"	3	"g"	"101498-4,15-8,16-6,16365-9,17-4,18-2,18861-5,18862-3,19-0,20-8,21-6,22-4,25274-2,25310-4,3344-9,55614-2,55615-9,55616-7,6976-5,6977-3,80133-2"
 "AMC"	23665637	"Amoxicillin/clavulanic acid"	"Beta-lactams/penicillins"	"J01CR02"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	"a/c,amcl,aml,aug,xl"	"amocla,amoclan,amoclav,amoksiclav,amoxsiklav,amoxyclav,augmentan,augmentin,augmentin xr,augmentine,auspilic,clamentin,clamobit,clavamox,clavinex,clavoxilin plus,clavulin,clavumox,coamoxiclav,eumetinex,kmoxilin,spectramox,spektramox,synulox,viaclav,xiclav"	1.5	"g"	3	"g"	""
-"AXS"	465441	"Amoxicillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
-"AMB"	5280965	"Amphotericin B"	"Antifungals/antimycotics"	"A01AB04,A07AA07,G01AA03,J02AA01"	"Antimycotics for systemic use"	"Antibiotics"	"amf,amfb,amph"	"abelcet,abelecet,ambisome,amfotericina b,amphocin,amphomoronal,amphortericin b,amphotec,amphotericin,amphotericin b,amphotericine b,amphotericinum b,amphozone,anfotericine b,fungilin,fungisome,fungisone,fungizone,halizon"	40	"mg"	35	"mg"	"16370-9,3353-0,3354-8,40707-2,40757-7,49859-2"
+"AXS"	465441	"Amoxicillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					"55614-2,55615-9,55616-7"
+"AMB"	5280965	"Amphotericin B"	"Antifungals/antimycotics"	"A01AB04,A07AA07,G01AA03,J02AA01"	"Antimycotics for systemic use"	"Antibiotics"	"amf,amfb,amph"	"abelcet,abelecet,ambisome,amfotericina b,amphocin,amphomoronal,amphortericin b,amphotec,amphotericin,amphotericin b,amphotericine b,amphotericinum b,amphozone,anfotericine b,fungilin,fungisome,fungisone,fungizone,halizon"	40	"mg"	35	"mg"	"16370-9,18863-1,23-2,24-0,25-7,26-5,3353-0,3354-8,40707-2,40757-7,49859-2,6978-1"
 "AMH"		"Amphotericin B-high"	"Aminoglycosides"	"NA"			"amfo b high,amhl,ampho b high,amphotericin high"	""					""
-"AMP"	6249	"Ampicillin"	"Beta-lactams/penicillins"	"J01CA01,S01AA19"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"am,amp,ampi"	"acillin,adobacillin,amblosin,amcill,amfipen,amfipen v,amipenix s,ampichel,ampicil,ampicilina,ampicillin,ampicillin a,ampicillin acid,ampicillin anhydrate,ampicillin anhydrous,ampicillin base,ampicillin hydrate,ampicillin sodium,ampicillina,ampicilline,ampicillinum,ampicin,ampifarm,ampikel,ampimed,ampipenin,ampiscel,ampisyn,ampivax,ampivet,amplacilina,amplin,amplipenyl,amplisom,amplital,anhydrous ampicillin,austrapen,binotal,bonapicillin,britacil,campicillin,copharcilin,delcillin,deripen,divercillin,doktacillin,duphacillin,grampenil,guicitrina,guicitrine,lifeampil,marcillin,morepen,norobrittin,nuvapen,olin kid,omnipen,orbicilina,pen a oral,pen ampil,penbristol,penbritin,penbritin paediatric,penbritin syrup,penbrock,penicline,penimic,pensyn,pentrex,pentrexl,pentrexyl,pentritin,pfizerpen a,polycillin,polyflex,ponecil,princillin,principen,qidamp,racenacillin,redicilin,rosampline,roscillin,semicillin,semicillin r,servicillin,sumipanto,synpenin,texcillin,tokiocillin,tolomol,totacillin,totalciclina,totapen,trifacilina,ukapen,ultrabion,ultrabron,vampen,viccillin,viccillin s,vidocillin,wypicil"	2	"g"	6	"g"	"21066-6,3355-5,33562-0,33919-2,43883-8,43884-6,87604-5"
-"SAM"	119561	"Ampicillin/sulbactam"	"Beta-lactams/penicillins"	"J01CR01"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	"a/s,ab,ams,amsu,apsu,sam"	"sulacillin"			6	"g"	""
+"AMP"	6249	"Ampicillin"	"Beta-lactams/penicillins"	"J01CA01,S01AA19"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"am,amp,ampi"	"acillin,adobacillin,amblosin,amcill,amfipen,amfipen v,amipenix s,ampichel,ampicil,ampicilina,ampicillin,ampicillin a,ampicillin acid,ampicillin anhydrate,ampicillin anhydrous,ampicillin base,ampicillin hydrate,ampicillin sodium,ampicillina,ampicilline,ampicillinum,ampicin,ampifarm,ampikel,ampimed,ampipenin,ampiscel,ampisyn,ampivax,ampivet,amplacilina,amplin,amplipenyl,amplisom,amplital,anhydrous ampicillin,austrapen,binotal,bonapicillin,britacil,campicillin,copharcilin,delcillin,deripen,divercillin,doktacillin,duphacillin,grampenil,guicitrina,guicitrine,lifeampil,marcillin,morepen,norobrittin,nuvapen,olin kid,omnipen,orbicilina,pen a oral,pen ampil,penbristol,penbritin,penbritin paediatric,penbritin syrup,penbrock,penicline,penimic,pensyn,pentrex,pentrexl,pentrexyl,pentritin,pfizerpen a,polycillin,polyflex,ponecil,princillin,principen,qidamp,racenacillin,redicilin,rosampline,roscillin,semicillin,semicillin r,servicillin,sumipanto,synpenin,texcillin,tokiocillin,tolomol,totacillin,totalciclina,totapen,trifacilina,ukapen,ultrabion,ultrabron,vampen,viccillin,viccillin s,vidocillin,wypicil"	2	"g"	6	"g"	"101477-8,101478-6,18864-9,18865-6,20374-5,21066-6,23618-2,27-3,28-1,29-9,30-7,31-5,32-3,33-1,3355-5,33562-0,33919-2,34-9,43883-8,43884-6,6979-9,6980-7,87604-5"
+"SAM"	119561	"Ampicillin/sulbactam"	"Beta-lactams/penicillins"	"J01CR01"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	"a/s,ab,ams,amsu,apsu,sam"	"sulacillin"			6	"g"	"101478-6,18865-6,20374-5,23618-2,31-5,32-3,33-1,34-9,6980-7"
 "AMR"	73341	"Amprolium"	"Other antibacterials"	"NA"			""	"amprocidum,amprol,amprolio,amprolium,amprolium chloride,amprovine,thiacoccid"					""
-"ANI"	166548	"Anidulafungin"	"Antifungals/antimycotics"	"J02AX06"	"Antimycotics for systemic use"	"Other antimycotics for systemic use"	"anid"	"anidulafungin,anidulafungina,anidulafungine,anidulafunginum,ecalta,eraxis"			0.1	"g"	"58420-1"
+"ANI"	166548	"Anidulafungin"	"Antifungals/antimycotics"	"J02AX06"	"Antimycotics for systemic use"	"Other antimycotics for systemic use"	"anid"	"anidulafungin,anidulafungina,anidulafungine,anidulafunginum,ecalta,eraxis"			0.1	"g"	"55343-8,57095-2,58420-1,77162-6"
 "APL"	6602341	"Apalcillin"	"Beta-lactams/penicillins"	"NA"			""	"apalcilina,apalcillin,apalcilline,apalcillinum"					""
-"APR"	3081545	"Apramycin"	"Aminoglycosides"	"NA"			""	"ambylan,apralan,apramicina,apramycin,apramycine,apramycinum,nebramycin ii"					""
-"ARB"	68682	"Arbekacin"	"Aminoglycosides"	"J01GB12"			""	"arbekacin,arbekacina,arbekacine,arbekacini sulfas,arbekacinum,habekacin,haberacin"			0.2	"g"	""
+"APR"	3081545	"Apramycin"	"Aminoglycosides"	"NA"			""	"ambylan,apralan,apramicina,apramycin,apramycine,apramycinum,nebramycin ii"					"23659-6,73652-0,73653-8"
+"ARB"	68682	"Arbekacin"	"Aminoglycosides"	"J01GB12"			""	"arbekacin,arbekacina,arbekacine,arbekacini sulfas,arbekacinum,habekacin,haberacin"			0.2	"g"	"32373-3,53818-1,54173-0"
 "APX"	71961	"Aspoxicillin"	"Beta-lactams/penicillins"	"J01CA19"			""	"aspoxicilina,aspoxicillan,aspoxicillin,aspoxicilline,aspoxicillinum"			4	"g"	""
 "AST"	5284517	"Astromicin"	"Aminoglycosides"	"NA"			""	"astromicin,astromicin a,astromicina,astromicine,astromicinum,fortimicin,fortimicin a"					""
 "AVB"	9835049	"Avibactam"	"Beta-lactams/penicillins"	"NA"			""	"avibactam,avibactam free acid,avibactamfreeacid"					""
-"AVI"	71674	"Avilamycin"	"Other antibacterials"	"NA"			""	"avilamycin,avilamycina,avilamycine,avilamycinum,surmax"					""
+"AVI"	71674	"Avilamycin"	"Other antibacterials"	"NA"			""	"avilamycin,avilamycina,avilamycine,avilamycinum,surmax"					"35754-1,35755-8,35756-6,55619-1"
 "AVO"	16131159	"Avoparcin"	"Glycopeptides"	"NA"			""	"avoparcin,avoparcina,avoparcine,avoparcinum,avotan"					""
 "AZD"	15574941	"Azidocillin"	"Beta-lactams/penicillins"	"J01CE04"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"azidocilina,azidocillin,azidocillina,azidocilline,azidocillinum"	1.5	"g"			""
-"AZM"	447043	"Azithromycin"	"Macrolides/lincosamides"	"J01FA10,S01AA26"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"az,azi,azit,azm"	"aritromicina,aruzilina,azasite,azenil,azifast,azigram,azimakrol,azithramycine,azithrocin,azithromycin,azithromycine,azithromycinum,azitrocin,azitromax,azitromicina,azitromicine,azitromin,aziwin,aziwok,aztrin,azyter,azythromycin,durasite,hemomycin,macrozit,misultina,mixoterin,setron,sumamed,toraseptol,tromix,trozocina,trulimax,xithrone,zentavion,zithrax,zithromac,zithromax,zithromax iv,zithromycin,zitrim,zitromax,zitrotek,zmax sr,zythromax"	0.3	"g"	0.5	"g"	"16420-2,25233-8"
+"AZM"	447043	"Azithromycin"	"Macrolides/lincosamides"	"J01FA10,S01AA26"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"az,azi,azit,azm"	"aritromicina,aruzilina,azasite,azenil,azifast,azigram,azimakrol,azithramycine,azithrocin,azithromycin,azithromycine,azithromycinum,azitrocin,azitromax,azitromicina,azitromicine,azitromin,aziwin,aziwok,aztrin,azyter,azythromycin,durasite,hemomycin,macrozit,misultina,mixoterin,setron,sumamed,toraseptol,tromix,trozocina,trulimax,xithrone,zentavion,zithrax,zithromac,zithromax,zithromax iv,zithromycin,zitrim,zitromax,zitrotek,zmax sr,zythromax"	0.3	"g"	0.5	"g"	"100043-9,16420-2,16421-0,18866-4,23612-5,25233-8,35-6,36-4,37-2,38-0,6981-5,89480-8"
 "AFC"		"Azithromycin/fluconazole/secnidazole"	"Other antibacterials"	"J01RA07"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
-"AZL"	6479523	"Azlocillin"	"Beta-lactams/penicillins"	"J01CA09"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"az,azl,azlo"	"azlocilina,azlocillin,azlocilline,azlocillinum"			12	"g"	""
-"ATM"	5742832	"Aztreonam"	"Beta-lactams/penicillins"	"J01DF01"	"Other beta-lactam antibacterials"	"Monobactams"	"at,atm,azm,azt,aztr"	"azactam,azetreonam,azonam,azthreonam,aztreon,aztreonam,nebactam,primbactam"			4	"g"	"16423-6,25234-6,3369-6"
+"AZL"	6479523	"Azlocillin"	"Beta-lactams/penicillins"	"J01CA09"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"az,azl,azlo"	"azlocilina,azlocillin,azlocilline,azlocillinum"			12	"g"	"16422-8,18867-2,3368-8,39-8,40-6,41-4,41661-0,42-2"
+"ATM"	5742832	"Aztreonam"	"Beta-lactams/penicillins"	"J01DF01"	"Other beta-lactam antibacterials"	"Monobactams"	"at,atm,azm,azt,aztr"	"azactam,azetreonam,azonam,azthreonam,aztreon,aztreonam,nebactam,primbactam"			4	"g"	"101497-6,16423-6,18868-0,25234-6,3369-6,41662-8,41663-6,41664-4,41727-9,43-0,44-8,45-5,46-3,6982-3"
 "AZA"		"Aztreonam/avibactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
 "ANC"		"Aztreonam/nacubactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
-"BAM"	441397	"Bacampicillin"	"Beta-lactams/penicillins"	"J01CA06"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"bacampicilina,bacampicillin,bacampicilline,bacampicillinum,penglobe"	1.2	"g"			""
-"BAC"	78358334	"Bacitracin"	"Other antibacterials"	"R02AB04,J01XX10"			"baci"	"fortracin,md bacitracin"					""
-"BDQ"	5388906	"Bedaquiline"	"Other antibacterials"	"J04AK05"			""	"bedaquiline,sirturo"	86	"mg"			"80637-2"
+"BAM"	441397	"Bacampicillin"	"Beta-lactams/penicillins"	"J01CA06"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"bacampicilina,bacampicillin,bacampicilline,bacampicillinum,penglobe"	1.2	"g"			"18869-8,47-1,48-9,49-7,50-5,55620-9"
+"BAC"	78358334	"Bacitracin"	"Other antibacterials"	"R02AB04,J01XX10"			"baci"	"fortracin,md bacitracin"					"10868-8,16428-5,18870-6,6827-0,6983-1,87603-7"
+"BDQ"	5388906	"Bedaquiline"	"Other antibacterials"	"J04AK05"			""	"bedaquiline,sirturo"	86	"mg"			"80637-2,88703-4,88704-2,94274-8,96107-8"
 "BEK"	439318	"Bekanamycin"	"Aminoglycosides"	"J01GB13"			""	"aminodeoxykanamycin,becanamicina,bekanamycin,bekanamycine,bekanamycinum,kanamycin b,klebcil,nebramycin v"			0.6	"g"	""
 "BNB"		"Benzathine benzylpenicillin"	"Beta-lactams/penicillins"	"J01CE08"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"beacillin,cepacilina,extencilline,lentopenil,penidural,tardocillin"			3.6	"g"	""
 "BNP"	64725	"Benzathine phenoxymethylpenicillin"	"Beta-lactams/penicillins"	"J01CE10"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"bicillin v,biphecillin"	2	"g"			""
 "PEN"	5904	"Benzylpenicillin"	"Beta-lactams/penicillins"	"J01CE01,S01AA14"	"Combinations of antibacterials"	"Combinations of antibacterials"	"bepe,pen,peni,peni g,penicillin,penicillin g,pg"	"abbocillin,ayercillin,bencilpenicilina,benzopenicillin,benzyl penicillin,benzylpenicillin,benzylpenicillin g,benzylpenicilline,benzylpenicillinum,bicillin,cillora,cilloral,cilopen,compocillin g,cosmopen,dropcillin,free penicillin g,free penicillin ii,galofak,gelacillin,liquacillin,megacillin,pencillin g,penicillin,penicilling,pentids,permapen,pfizerpen,pfizerpen g,pharmacillin,pradupen,specilline g,ursopen"			3.6	"g"	""
-"BES"	10178705	"Besifloxacin"	"Quinolones"	"S01AE08"			""	"besifloxacin,besivance"					""
-"BIA"	71339	"Biapenem"	"Carbapenems"	"J01DH05"			""	"biapenem,biapenern,bipenem,omegacin"			1.2	"g"	""
+"BES"	10178705	"Besifloxacin"	"Quinolones"	"S01AE08"			""	"besifloxacin,besivance"					"73606-6,73628-0,73651-2"
+"BIA"	71339	"Biapenem"	"Carbapenems"	"J01DH05"			""	"biapenem,biapenern,bipenem,omegacin"			1.2	"g"	"41665-1,41666-9,41667-7,41728-7"
 "BCZ"	65807	"Bicyclomycin"	"Other antibacterials"	"NA"			"bicozamycin"	"aizumycin,bacfeed,bacteron,bicozamicina,bicozamycin,bicozamycine,bicozamycinum,bicyclomycin"					""
 "BDP"	68760	"Brodimoprim"	"Trimethoprims"	"J01EA02"	"Sulfonamides and trimethoprim"	"Trimethoprim and derivatives"	""	"brodimoprim,brodimoprima,brodimoprime,brodimoprimum,bromdimoprim,hyprim,unitrim"	0.2	"g"			""
 "BUT"	47472	"Butoconazole"	"Antifungals/antimycotics"	"G01AF15"			""	"butaconazole,butoconazol,butoconazole,butoconazolum,compositenstarke,dahlin,femstat,gynofort,polyfructosanum"					""
 "CDZ"	44242317	"Cadazolid"	"Oxazolidinones"	"NA"			""	"cadazolid"					""
 "CLA"		"Calcium aminosalicylate"	"Antimycobacterials"	"J04AA03"	"Drugs for treatment of tuberculosis"	"Aminosalicylic acid and derivatives"	""	""	15	"g"			""
-"CAP"	135565060	"Capreomycin"	"Antimycobacterials"	"J04AB30"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"capr"	""			1	"g"	""
-"CRB"	20824	"Carbenicillin"	"Beta-lactams/penicillins"	"J01CA03"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"bar,carb,cb"	"anabactyl,carbenicilina,carbenicillin,carbenicillina,carbenicilline,carbenicillinum,geopen,pyopen"			12	"g"	"3434-8"
+"CAP"	135565060	"Capreomycin"	"Antimycobacterials"	"J04AB30"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"capr"	""			1	"g"	"16545-6,18872-2,23607-5,25210-6,25211-4,25212-2,42643-7,48170-5,55-4,55623-3,56-2,57-0,58-8,61355-4,89483-2"
+"CRB"	20824	"Carbenicillin"	"Beta-lactams/penicillins"	"J01CA03"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"bar,carb,cb"	"anabactyl,carbenicilina,carbenicillin,carbenicillina,carbenicilline,carbenicillinum,geopen,pyopen"			12	"g"	"18873-0,3434-8,41668-5,59-6,60-4,61-2,62-0"
 "CRN"	93184	"Carindacillin"	"Beta-lactams/penicillins"	"J01CA05"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"carindacilina,carindacillin,carindacilline,carindacillinum"	4	"g"			""
-"CAR"	6540466	"Carumonam"	"Other antibacterials"	"J01DF02"			""	"carumonam,carumonamum"			2	"g"	""
-"CAS"	2826718	"Caspofungin"	"Antifungals/antimycotics"	"J02AX04"	"Antimycotics for systemic use"	"Other antimycotics for systemic use"	"casp"	"cancidas,capsofungin,caspofungin"			50	"mg"	"58419-3"
-"CAC"	91562	"Cefacetrile"	"Cephalosporins (1st gen.)"	"J01DB10"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"cefacetril,cefacetrile,cefacetrilo,cefacetrilum,celospor,celtol,cephacetrile,cristacef,vetrimast"					""
-"CEC"	51039	"Cefaclor"	"Cephalosporins (2nd gen.)"	"J01DC04"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"ccl,cec,cf,cfac,cfc,cfcl,cfr,fac"	"alenfral,alfacet,ceclor,ceclor cd,cefaclor,cefaclor anhydrous,cefaclor impurity c,cefaclor monohydrate,cefaclorimpurityc,cefacloro,cefaclorum,cefeaclor,cephaclor,dystaclor mr,keflor,kefral,panoral,raniclor"	1	"g"			"16564-7,21149-0"
-"CFR"	47965	"Cefadroxil"	"Cephalosporins (1st gen.)"	"J01DB05"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfdx,cfr,fad"	"anhydrous cefadroxil,cefadrops,cefadroxil,cefadroxil anhydrous,cefadroxilo,cefadroxilum,cefradroxil,cephadroxil,duracef,duricef,sumacef,ultracef"	2	"g"			"16565-4"
+"CAR"	6540466	"Carumonam"	"Other antibacterials"	"J01DF02"			""	"carumonam,carumonamum"			2	"g"	"51694-8"
+"CAS"	2826718	"Caspofungin"	"Antifungals/antimycotics"	"J02AX04"	"Antimycotics for systemic use"	"Other antimycotics for systemic use"	"casp"	"cancidas,capsofungin,caspofungin"			50	"mg"	"32378-2,54175-5,54176-3,54185-4,58419-3"
+"CAC"	91562	"Cefacetrile"	"Cephalosporins (1st gen.)"	"J01DB10"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"cefacetril,cefacetrile,cefacetrilo,cefacetrilum,celospor,celtol,cephacetrile,cristacef,vetrimast"					"55624-1,55625-8,55626-6,55627-4"
+"CEC"	51039	"Cefaclor"	"Cephalosporins (2nd gen.)"	"J01DC04"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"ccl,cec,cf,cfac,cfc,cfcl,cfr,fac"	"alenfral,alfacet,ceclor,ceclor cd,cefaclor,cefaclor anhydrous,cefaclor impurity c,cefaclor monohydrate,cefaclorimpurityc,cefacloro,cefaclorum,cefeaclor,cephaclor,dystaclor mr,keflor,kefral,panoral,raniclor"	1	"g"			"16564-7,18874-8,21149-0,6986-4,83-6,84-4,85-1,86-9"
+"CFR"	47965	"Cefadroxil"	"Cephalosporins (1st gen.)"	"J01DB05"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfdx,cfr,fad"	"anhydrous cefadroxil,cefadrops,cefadroxil,cefadroxil anhydrous,cefadroxilo,cefadroxilum,cefradroxil,cephadroxil,duracef,duricef,sumacef,ultracef"	2	"g"			"16565-4,18875-5,55628-2,63-8,64-6,65-3,66-1"
 "LEX"	27447	"Cefalexin"	"Cephalosporins (1st gen.)"	"J01DB01"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cflx"	"alcephin,alexin,alsporin,amplex,anhydrous cefalexin,anhydrous cephalexin,biocef,carnosporin,cefablan,cefadal,cefadin,cefadina,cefaleksin,cefalessina,cefalexin,cefalexin anhydrous,cefalexina,cefalexine,cefalexinum,cefalin,cefaloto,cefaseptin,ceffanex,ceflax,ceforal,cefovit,celexin,cepastar,cepexin,cephacillin,cephalexin,cephalexin anhydrous,cephalexine,cephalexinum,cephanasten,cephaxin,cephin,ceporex,ceporex forte,ceporexin,ceporexine,cerexin,cerexins,cophalexin,durantel,durantel ds,erocetin,factagard,felexin,ibilex,ibrexin,inphalex,kefalospes,keflet,keflex,kefolan,keforal,keftab,kekrinal,kidolex,lafarine,larixin,lenocef,lexibiotico,lonflex,lopilexin,madlexin,mamalexin,mamlexin,medoxine,neokef,neolexina,novolexin,optocef,oracef,oriphex,oroxin,ortisporina,ospexin,palitrex,panixine disperdose,pectril,pyassan,roceph,roceph distab,sanaxin,sartosona,sencephalin,sepexin,servispor,sialexin,sinthecillin,sporicef,sporidex,syncle,synecl,tepaxin,tokiolexin,uphalexin,voxxim,winlex,zozarine"	2	"g"			""
 "RID"	5773	"Cefaloridine"	"Cephalosporins (1st gen.)"	"J01DB02"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cefa"	"aliporina,ampligram,cefaloridin,cefaloridina,cefaloridine,cefaloridinum,cefalorizin,ceflorin,cepaloridin,cepalorin,cephalomycine,cephaloridin,cephaloridine,cephaloridinum,ceporan,ceporin,ceporine,cilifor,deflorin,faredina,floridin,glaxoridin,intrasporin,keflodin,keflordin,kefloridin,kefspor,lloncefal,loridine,sasperin,sefacin,verolgin,vioviantine"			3	"g"	""
 "CEP"	6024	"Cefalotin"	"Cephalosporins (1st gen.)"	"J01DB03"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfal,cflt"	"cefalothin,cefalotin,cefalotina,cefalotina fabra,cefalotine,cefalotinum,cemastin,cephalothinum,cephalotin,cephalotin acid,coaxin,keflin,seffin"			4	"g"	""
-"MAN"	456255	"Cefamandole"	"Cephalosporins (2nd gen.)"	"J01DC03"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cfam,cfmn"	"cefadole,cefamandol,cefamandole,cefamandolum,cephadole,cephamandole,kefamandol,kefdole,mancef"			6	"g"	"3441-3"
+"MAN"	456255	"Cefamandole"	"Cephalosporins (2nd gen.)"	"J01DC03"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cfam,cfmn"	"cefadole,cefamandol,cefamandole,cefamandolum,cephadole,cephamandole,kefamandol,kefdole,mancef"			6	"g"	"18876-3,3441-3,41669-3,55634-0,55635-7,55636-5,55637-3,67-9,68-7,69-5,70-3"
 "HAP"	30699	"Cefapirin"	"Cephalosporins (1st gen.)"	"J01DB08"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"ambrocef,cefadyl,cefapilin,cefapirin,cefapirina,cefapirine,cefapirinum,cefaprin,cefaprin sodium,cefatrex,cefatrexyl,cephapirine,metricure"			4	"g"	""
-"CTZ"	6410758	"Cefatrizine"	"Cephalosporins (1st gen.)"	"J01DB07"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"bricef,cefatrix,cefatrizine,cefatrizino,cefatrizinum,cephatriazine,cepticol,cetrazil,latocef,orosporina,trizina"	1	"g"			""
+"CTZ"	6410758	"Cefatrizine"	"Cephalosporins (1st gen.)"	"J01DB07"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"bricef,cefatrix,cefatrizine,cefatrizino,cefatrizinum,cephatriazine,cepticol,cetrazil,latocef,orosporina,trizina"	1	"g"			"18877-1,55639-9,71-1,72-9,73-7,74-5"
 "CZD"	71736	"Cefazedone"	"Cephalosporins (1st gen.)"	"J01DB06"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"cefazedon,cefazedona,cefazedone,cefazedone acid,cefazedonum,refosporen,refosporene,refosporin"			3	"g"	""
-"CZO"	33255	"Cefazolin"	"Cephalosporins (1st gen.)"	"J01DB04"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfz,cfzl,cz,czol,faz,kz"	"atirin,cefamezin,cefamezine,cefazina,cefazolin,cefazolin acid,cefazolina,cefazoline,cefazolinum,cephamezine,cephazolidin,cephazolin,cephazoline,elzogram,firmacef,kefzol,liviclina,totacef"			3	"g"	"16566-2,25235-3,3442-1,3443-9,80962-4"
+"CZO"	33255	"Cefazolin"	"Cephalosporins (1st gen.)"	"J01DB04"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfz,cfzl,cz,czol,faz,kz"	"atirin,cefamezin,cefamezine,cefazina,cefazolin,cefazolin acid,cefazolina,cefazoline,cefazolinum,cephamezine,cephazolidin,cephazolin,cephazoline,elzogram,firmacef,kefzol,liviclina,totacef"			3	"g"	"16566-2,18878-9,25235-3,3442-1,3443-9,41670-1,75-2,76-0,77-8,78-6,80962-4,85422-4"
 "CFB"	127527	"Cefbuperazone"	"Other antibacterials"	"J01DC13"			""	"cefbuperazona,cefbuperazone,cefbuperazonum,cefbuperzaone,cerbuperazone,tomiporan"			2	"g"	""
-"CCP"	6436055	"Cefcapene"	"Cephalosporins (3rd gen.)"	"J01DD17"			""	"cefcamate,cefcapene"	0.45	"g"			""
+"CCP"	6436055	"Cefcapene"	"Cephalosporins (3rd gen.)"	"J01DD17"			""	"cefcamate,cefcapene"	0.45	"g"			"100044-7,76143-7"
 "CCX"	5282438	"Cefcapene pivoxil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefcamate pivoxil,cefcapene piroxil"					""
-"CDR"	6915944	"Cefdinir"	"Cephalosporins (3rd gen.)"	"J01DD15"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cd,cdn,cdr,cfd,din"	"cefdinir,cefdinir anhydrous,cefdinirum,cefdinyl,cefdirnir,ceftinex,cefzon,omnicef"	0.6	"g"			""
-"DIT"	9870843	"Cefditoren"	"Cephalosporins (3rd gen.)"	"J01DD16"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cdn"	"cefditoren"	0.4	"g"			""
+"CDR"	6915944	"Cefdinir"	"Cephalosporins (3rd gen.)"	"J01DD15"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cd,cdn,cdr,cfd,din"	"cefdinir,cefdinir anhydrous,cefdinirum,cefdinyl,cefdirnir,ceftinex,cefzon,omnicef"	0.6	"g"			"23636-4,23637-2,35757-4,35758-2"
+"DIT"	9870843	"Cefditoren"	"Cephalosporins (3rd gen.)"	"J01DD16"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cdn"	"cefditoren"	0.4	"g"			"35759-0,35760-8,35761-6,35762-4"
 "DIX"	6437877	"Cefditoren pivoxil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefditoren,cefditoren pi voxil,cefditoren pivoxil,cefditorin,cefditorin pivoxil,meiact,spectracef"					""
-"FEP"	5479537	"Cefepime"	"Cephalosporins (4th gen.)"	"J01DE01"	"Other beta-lactam antibacterials"	"Fourth-generation cephalosporins"	"cfep,cfpi,cpe,cpm,fep,pm,xpm"	"axepim,cefepima,cefepime,cefepimum,cepimax,cepimex,maxcef,maxipime"			4	"g"	"38363-8"
+"FEP"	5479537	"Cefepime"	"Cephalosporins (4th gen.)"	"J01DE01"	"Other beta-lactam antibacterials"	"Fourth-generation cephalosporins"	"cfep,cfpi,cpe,cpm,fep,pm,xpm"	"axepim,cefepima,cefepime,cefepimum,cepimax,cepimex,maxcef,maxipime"			4	"g"	"101502-3,18879-7,31142-3,31143-1,35763-2,38363-8,42350-9,42351-7,42353-3,50631-1,58412-8,6643-1,6644-9,6645-7,6646-5,6987-2,8272-7,8273-5"
 "CFA"		"Cefepime/amikacin"	"Other antibacterials"	"J01RA06"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "CPC"	9567559	"Cefepime/clavulanic acid"	"Cephalosporins (4th gen.)"	"NA"			"cicl,xpml"	""					""
 "FNC"		"Cefepime/nacubactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
 "FPT"	9567558	"Cefepime/tazobactam"	"Cephalosporins (4th gen.)"	"NA"			""	""					""
 "FPZ"		"Cefepime/zidebactam"	"Other antibacterials"	"NA"			""	""					""
-"CAT"	5487888	"Cefetamet"	"Cephalosporins (3rd gen.)"	"J01DD10"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"cefetamet,cefetametum,cepime o,deacetoxycefotaxime"	1	"g"			""
+"CAT"	5487888	"Cefetamet"	"Cephalosporins (3rd gen.)"	"J01DD10"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"cefetamet,cefetametum,cepime o,deacetoxycefotaxime"	1	"g"			"32377-4,35764-0,35765-7,55640-7"
 "CPI"	5486182	"Cefetamet pivoxil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefetamet pivoxyl,globocef"					""
 "CCL"	71719688	"Cefetecol"	"Cephalosporins (4th gen.)"	"NA"			"cefcatacol"	"cefetecol,cefetecol anhydrous"					""
 "CZL"	193956	"Cefetrizole"	"Cephalosporins (unclassified gen.)"	"NA"			""	"cefetrizole,cefetrizolum"					""
-"FDC"	77843966	"Cefiderocol"	"Other antibacterials"	"J01DI04"			""	"cefiderocol"					""
-"CFM"	5362065	"Cefixime"	"Cephalosporins (3rd gen.)"	"J01DD08"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfe,cfix,cfxm,dcfm,fix,ix"	"anhydrous cefixime,cefixim,cefixima,cefixime,cefixime anhydrous,cefixime hydrate,cefiximum,cefixoral,cefspan,cephoral,citropen,denvar,necopen,oroken,suprax,tricef,unixime"	0.4	"g"			"16567-0,25236-1"
+"FDC"	77843966	"Cefiderocol"	"Other antibacterials"	"J01DI04"			""	"cefiderocol"					"95767-0,99280-0,99503-5"
+"CFM"	5362065	"Cefixime"	"Cephalosporins (3rd gen.)"	"J01DD08"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfe,cfix,cfxm,dcfm,fix,ix"	"anhydrous cefixime,cefixim,cefixima,cefixime,cefixime anhydrous,cefixime hydrate,cefiximum,cefixoral,cefspan,cephoral,citropen,denvar,necopen,oroken,suprax,tricef,unixime"	0.4	"g"			"16567-0,18880-5,25236-1,35766-5,79-4,80-2,81-0,82-8"
 "CEO"		"Cefixime/ornidazole"	"Other antibacterials"	"J01RA15"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
-"CMX"	9570757	"Cefmenoxime"	"Cephalosporins (3rd gen.)"	"J01DD05"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"bestron,cefmax,cefmenoxima,cefmenoxime,cefmenoximum"			2	"g"	""
-"CMZ"	42008	"Cefmetazole"	"Cephalosporins (2nd gen.)"	"J01DC09"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"cefmetazole,cefmetazolesodium,cefmetazolo,cefmetazolum"			4	"g"	""
-"CNX"	71141	"Cefminox"	"Other antibacterials"	"J01DC12"			""	"cefminox,cefminoxum"			4	"g"	""
-"DIZ"	5361871	"Cefodizime"	"Cephalosporins (3rd gen.)"	"J01DD09"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"cefodizima,cefodizime,cefodizime acid,cefodizime disodium,cefodizimum,cefodizme,diezime,modivid,neucef,timecef"			2	"g"	""
-"CID"	43594	"Cefonicid"	"Cephalosporins (2nd gen.)"	"J01DC06"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"cefonicid,cefonicido,cefonicidum,monocef"			1	"g"	"25237-9,3444-7"
-"CFP"	44187	"Cefoperazone"	"Cephalosporins (3rd gen.)"	"J01DD12"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfp,cfpz,cp,cpz,fop,per"	"bioperazone,cefobid,cefoperazine,cefoperazon,cefoperazone,cefoperazone acid,cefoperazono,cefoperazonum,cefozon,medocef,myticef,pathozone,peracef"			4	"g"	"3445-4"
-"CSL"		"Cefoperazone/sulbactam"	"Cephalosporins (3rd gen.)"	"J01DD62"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	""			4	"g"	""
-"CND"	43507	"Ceforanide"	"Cephalosporins (2nd gen.)"	"J01DC11"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"ceforanide,ceforanido,ceforanidum,precef,radacef"			4	"g"	""
+"CMX"	9570757	"Cefmenoxime"	"Cephalosporins (3rd gen.)"	"J01DD05"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"bestron,cefmax,cefmenoxima,cefmenoxime,cefmenoximum"			2	"g"	"32375-8,54174-8,54203-5,55641-5"
+"CMZ"	42008	"Cefmetazole"	"Cephalosporins (2nd gen.)"	"J01DC09"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"cefmetazole,cefmetazolesodium,cefmetazolo,cefmetazolum"			4	"g"	"11575-8,18881-3,25222-1,87-7,88-5,89-3,90-1"
+"CNX"	71141	"Cefminox"	"Other antibacterials"	"J01DC12"			""	"cefminox,cefminoxum"			4	"g"	"54908-9"
+"DIZ"	5361871	"Cefodizime"	"Cephalosporins (3rd gen.)"	"J01DD09"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"cefodizima,cefodizime,cefodizime acid,cefodizime disodium,cefodizimum,cefodizme,diezime,modivid,neucef,timecef"			2	"g"	"18882-1,6988-0,91-9,92-7,93-5,94-3"
+"CID"	43594	"Cefonicid"	"Cephalosporins (2nd gen.)"	"J01DC06"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"cefonicid,cefonicido,cefonicidum,monocef"			1	"g"	"18883-9,25237-9,3444-7,55642-3,95-0,96-8,97-6,98-4"
+"CFP"	44187	"Cefoperazone"	"Cephalosporins (3rd gen.)"	"J01DD12"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfp,cfpz,cp,cpz,fop,per"	"bioperazone,cefobid,cefoperazine,cefoperazon,cefoperazone,cefoperazone acid,cefoperazono,cefoperazonum,cefozon,medocef,myticef,pathozone,peracef"			4	"g"	"100-8,101-6,102-4,18884-7,3445-4,35767-3,35768-1,54166-4,54167-2,54168-0,99-2"
+"CSL"		"Cefoperazone/sulbactam"	"Cephalosporins (3rd gen.)"	"J01DD62"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	""			4	"g"	"35768-1,54166-4,54167-2,54168-0"
+"CND"	43507	"Ceforanide"	"Cephalosporins (2nd gen.)"	"J01DC11"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"ceforanide,ceforanido,ceforanidum,precef,radacef"			4	"g"	"103-2,104-0,105-7,106-5,18885-4,55643-1"
 "CSE"	9830519	"Cefoselis"	"Cephalosporins (4th gen.)"	"NA"			""	"cefoselis,cefoselis sulfate,wincef,winsef"					""
-"CTX"	5742673	"Cefotaxime"	"Cephalosporins (3rd gen.)"	"J01DD01"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfot,cft,cftx,ct,ctx,fot,tax,xct"	"cefotaxim,cefotaxim hikma,cefotaxima,cefotaxima acid,cefotaxime,cefotaxime acid,cefotaximum,cephotaxime,claforan,omnatax"			4	"g"	"25238-7,3446-2,80961-6"
+"CTX"	5742673	"Cefotaxime"	"Cephalosporins (3rd gen.)"	"J01DD01"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfot,cft,cftx,ct,ctx,fot,tax,xct"	"cefotaxim,cefotaxim hikma,cefotaxima,cefotaxima acid,cefotaxime,cefotaxime acid,cefotaximum,cephotaxime,claforan,omnatax"			4	"g"	"101479-4,101480-2,107-3,108-1,109-9,110-7,18886-2,25238-7,31138-1,31139-9,3446-2,35769-9,35770-7,35771-5,41671-9,50632-9,52128-6,54191-2,54192-0,54193-8,55189-5,55644-9,6989-8,80961-6"
 "CTC"	9575353	"Cefotaxime/clavulanic acid"	"Cephalosporins (3rd gen.)"	"NA,J01DD51"			"cxcl,xctl"	""					""
-"CTS"	9574753	"Cefotaxime/sulbactam"	"Cephalosporins (3rd gen.)"	"NA"			""	""					""
-"CTT"	53025	"Cefotetan"	"Cephalosporins (2nd gen.)"	"J01DC05"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cftt,cn,cte,ctn,ctt,tans"	"apacef,cefotan,cefotetan,cefotetan acid,cefotetan free acid,cefotetanum"			4	"g"	"25239-5,3447-0"
-"CTF"	43708	"Cefotiam"	"Cephalosporins (2nd gen.)"	"J01DC07"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"cefotiam,cefotiam?,cefotiamum,ceradolan,ceradon,haloapor"	1.2	"g"	4	"g"	""
-"CHE"	125846	"Cefotiam hexetil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefotiam cilexetil,pansporin t"					""
-"FOV"	9578573	"Cefovecin"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefovecin"					""
-"FOX"	441199	"Cefoxitin"	"Cephalosporins (2nd gen.)"	"J01DC01"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cfox,cfx,cfxt,cx,fox,fx"	"cefoxitin,cefoxitina,cefoxitine,cefoxitinum,cefoxotin,cenomycin,cephoxitin,mefoxin,mefoxitin,rephoxitin"			6	"g"	"25240-3,3448-8"
+"CTS"	9574753	"Cefotaxime/sulbactam"	"Cephalosporins (3rd gen.)"	"NA"			""	""					"54191-2,54192-0,54193-8,55644-9"
+"CTT"	53025	"Cefotetan"	"Cephalosporins (2nd gen.)"	"J01DC05"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cftt,cn,cte,ctn,ctt,tans"	"apacef,cefotan,cefotetan,cefotetan acid,cefotetan free acid,cefotetanum"			4	"g"	"111-5,112-3,113-1,114-9,18887-0,25239-5,3447-0,41672-7,41673-5,41674-3,41729-5,6990-6"
+"CTF"	43708	"Cefotiam"	"Cephalosporins (2nd gen.)"	"J01DC07"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	""	"cefotiam,cefotiam?,cefotiamum,ceradolan,ceradon,haloapor"	1.2	"g"	4	"g"	"32374-1,35772-3,35773-1,55645-6,55737-1,55738-9,55739-7,55740-5"
+"CHE"	125846	"Cefotiam hexetil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefotiam cilexetil,pansporin t"					"55737-1,55738-9,55739-7,55740-5"
+"FOV"	9578573	"Cefovecin"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefovecin"					"76147-8,87792-8"
+"FOX"	441199	"Cefoxitin"	"Cephalosporins (2nd gen.)"	"J01DC01"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cfox,cfx,cfxt,cx,fox,fx"	"cefoxitin,cefoxitina,cefoxitine,cefoxitinum,cefoxotin,cenomycin,cephoxitin,mefoxin,mefoxitin,rephoxitin"			6	"g"	"101492-7,115-6,116-4,117-2,118-0,18888-8,25220-5,25240-3,25366-6,3448-8,41675-0,41676-8,41677-6,41730-3,6991-4"
 "FOX1"		"Cefoxitin screening"	"Cephalosporins (2nd gen.)"	"NA"			"cfsc"	""					""
-"ZOP"	9571080	"Cefozopran"	"Cephalosporins (4th gen.)"	"J01DE03"			""	"cefozopran"			4	"g"	""
+"ZOP"	9571080	"Cefozopran"	"Cephalosporins (4th gen.)"	"J01DE03"			""	"cefozopran"			4	"g"	"100045-4,53820-7"
 "CFZ"	68597	"Cefpimizole"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefpimizol,cefpimizole,cefpimizole sodium,cefpimizolum"					""
 "CPM"	636405	"Cefpiramide"	"Cephalosporins (3rd gen.)"	"J01DD11"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	"cefpiramide,cefpiramide acid,cefpiramido,cefpiramidum"			2	"g"	""
-"CPO"	5479539	"Cefpirome"	"Cephalosporins (4th gen.)"	"J01DE02"	"Other beta-lactam antibacterials"	"Fourth-generation cephalosporins"	"cfpr"	"broact,cefpiroma,cefpirome,cefpiromum,cefrom,cerfpirome,keiten"			4	"g"	""
-"CPD"	6335986	"Cefpodoxime"	"Cephalosporins (3rd gen.)"	"J01DD13"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfpd,cfpo,cpd,pod,px"	"cefpodoxim acid,cefpodoxima,cefpodoxime,cefpodoxime acid,cefpodoximum,epoxim"	0.4	"g"			"25241-1"
+"CPO"	5479539	"Cefpirome"	"Cephalosporins (4th gen.)"	"J01DE02"	"Other beta-lactam antibacterials"	"Fourth-generation cephalosporins"	"cfpr"	"broact,cefpiroma,cefpirome,cefpiromum,cefrom,cerfpirome,keiten"			4	"g"	"18889-6,6647-3,6648-1,6649-9,6650-6,6992-2,8274-3,8275-0,8276-8"
+"CPD"	6335986	"Cefpodoxime"	"Cephalosporins (3rd gen.)"	"J01DD13"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfpd,cfpo,cpd,pod,px"	"cefpodoxim acid,cefpodoxima,cefpodoxime,cefpodoxime acid,cefpodoximum,epoxim"	0.4	"g"			"119-8,120-6,121-4,122-2,18890-4,25241-1,41678-4,41679-2,41680-0,41731-1,6993-0,90849-1"
 "CPX"	6526396	"Cefpodoxime proxetil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefodox,cefoprox,cefpodoxime proxetil,cepodem,orelox,orelox paed,otreon,podomexef,simplicef,vantin"					""
 "CDC"		"Cefpodoxime/clavulanic acid"	"Cephalosporins (3rd gen.)"	"NA"			"cecl"	""					""
-"CPR"	5281006	"Cefprozil"	"Cephalosporins (2nd gen.)"	"J01DC10"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cpr,cpz,fp"	"arzimol,brisoral,cefprozil,cefprozil anhydrous,cefprozil hydrate,cefprozilo,cefprozilum,cefzil,cronocef,procef,serozil"	1	"g"			""
-"CEQ"	5464355	"Cefquinome"	"Cephalosporins (4th gen.)"	"NA"			""	"cefquinoma,cefquinome,cefquinomum,cobactan"					""
+"CPR"	5281006	"Cefprozil"	"Cephalosporins (2nd gen.)"	"J01DC10"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cpr,cpz,fp"	"arzimol,brisoral,cefprozil,cefprozil anhydrous,cefprozil hydrate,cefprozilo,cefprozilum,cefzil,cronocef,procef,serozil"	1	"g"			"123-0,124-8,125-5,126-3,18891-2,6994-8"
+"CEQ"	5464355	"Cefquinome"	"Cephalosporins (4th gen.)"	"NA"			""	"cefquinoma,cefquinome,cefquinomum,cobactan"					"100046-2,76150-2"
 "CRD"	5284529	"Cefroxadine"	"Cephalosporins (1st gen.)"	"J01DB11"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"cefroxadin,cefroxadine,cefroxadino,cefroxadinum,oraspor"	2.1	"g"			""
-"CFS"	656575	"Cefsulodin"	"Cephalosporins (3rd gen.)"	"J01DD03"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfsl,cfsu"	"cefonomil,cefsulodin,cefsulodine,cefsulodino,cefsulodinum"			4	"g"	"131-3,25242-9"
+"CFS"	656575	"Cefsulodin"	"Cephalosporins (3rd gen.)"	"J01DD03"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfsl,cfsu"	"cefonomil,cefsulodin,cefsulodine,cefsulodino,cefsulodinum"			4	"g"	"127-1,128-9,129-7,130-5,131-3,18892-0,25242-9,55647-2"
 "CSU"	68718	"Cefsumide"	"Cephalosporins (unclassified gen.)"	"NA"			""	"cefsulmid,cefsumide,cefsumido,cefsumidum"					""
-"CPT"	56841980	"Ceftaroline"	"Cephalosporins (5th gen.)"	"J01DI02"			"cfro"	"ceftaroline fosamil,teflaro,zinforo"			1.2	"g"	""
-"CPA"		"Ceftaroline/avibactam"	"Cephalosporins (5th gen.)"	"NA"			""	""					""
-"CAZ"	5481173	"Ceftazidime"	"Cephalosporins (3rd gen.)"	"J01DD02"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"caz,cefta,cfta,cftz,taz,tz,xtz"	"ceftazidim,ceftazidima,ceftazidime,ceftazidimum,ceptaz,fortaz,fortum,pentacef,tazicef,tazidime"			4	"g"	"21151-6,3449-6,80960-8"
-"CZA"	90643431	"Ceftazidime/avibactam"	"Cephalosporins (3rd gen.)"	"NA"			"cfav"	"avycaz,zavicefta"					""
+"CPT"	56841980	"Ceftaroline"	"Cephalosporins (5th gen.)"	"J01DI02"			"cfro"	"ceftaroline fosamil,teflaro,zinforo"			1.2	"g"	"73604-1,73605-8,73626-4,73627-2,73649-6,73650-4,74170-2"
+"CPA"		"Ceftaroline/avibactam"	"Cephalosporins (5th gen.)"	"NA"			""	""					"73604-1,73626-4,73649-6"
+"CAZ"	5481173	"Ceftazidime"	"Cephalosporins (3rd gen.)"	"J01DD02"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"caz,cefta,cfta,cftz,taz,tz,xtz"	"ceftazidim,ceftazidima,ceftazidime,ceftazidimum,ceptaz,fortaz,fortum,pentacef,tazicef,tazidime"			4	"g"	"101481-0,101482-8,101483-6,132-1,133-9,134-7,135-4,18893-8,21151-6,3449-6,35774-9,35775-6,35776-4,42352-5,55648-0,55649-8,55650-6,55651-4,58705-5,6995-5,73603-3,73625-6,73648-8,80960-8,87734-0,90850-9"
+"CZA"	90643431	"Ceftazidime/avibactam"	"Cephalosporins (3rd gen.)"	"NA"			"cfav"	"avycaz,zavicefta"					"101483-6,73603-3,73625-6,73648-8,87734-0"
 "CCV"	9575352	"Ceftazidime/clavulanic acid"	"Cephalosporins (3rd gen.)"	"J01DD52"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"czcl,xtzl"	""			6	"g"	""
-"CEM"	6537431	"Cefteram"	"Cephalosporins (3rd gen.)"	"J01DD18"			""	"cefteram,cefterame,cefteramum,ceftetrame"	0.4	"g"			""
+"CEM"	6537431	"Cefteram"	"Cephalosporins (3rd gen.)"	"J01DD18"			""	"cefteram,cefterame,cefteramum,ceftetrame"	0.4	"g"			"100047-0,76144-5"
 "CPL"	5362114	"Cefteram pivoxil"	"Cephalosporins (3rd gen.)"	"NA"			""	"cefteram pivoxil,cefterampivoxil,tomiron"					""
 "CTL"	65755	"Ceftezole"	"Cephalosporins (1st gen.)"	"J01DB12"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	""	"ceftezol,ceftezole,ceftezolo,ceftezolum,demethylcefazolin"			3	"g"	""
-"CTB"	5282242	"Ceftibuten"	"Cephalosporins (3rd gen.)"	"J01DD14"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cb,cfbu,ctb,tib"	"ceftem,ceftibuten,ceftibuten dihydrate,ceftibuten hydrate,ceftibutene,ceftibuteno,ceftibutenum,ceftibutin,cephem,ceprifran,isocef,keimax"	0.4	"g"			""
-"TIO"	6328657	"Ceftiofur"	"Cephalosporins (3rd gen.)"	"NA"			""	"ceftiofur,ceftiofurum,excede,excenel,naxcel"					""
-"CZX"	6533629	"Ceftizoxime"	"Cephalosporins (3rd gen.)"	"J01DD07"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfzx,ctz,cz,czx,tiz,zox"	"cefizox,ceftisomin,ceftix,ceftizoxima,ceftizoxime,ceftizoximum,epocelin,eposerin"			4	"g"	"25243-7,3450-4"
+"CTB"	5282242	"Ceftibuten"	"Cephalosporins (3rd gen.)"	"J01DD14"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cb,cfbu,ctb,tib"	"ceftem,ceftibuten,ceftibuten dihydrate,ceftibuten hydrate,ceftibutene,ceftibuteno,ceftibutenum,ceftibutin,cephem,ceprifran,isocef,keimax"	0.4	"g"			"35777-2,35778-0,35779-8,6996-3"
+"TIO"	6328657	"Ceftiofur"	"Cephalosporins (3rd gen.)"	"NA"			""	"ceftiofur,ceftiofurum,excede,excenel,naxcel"					"23709-9,35780-6,35781-4,55652-2"
+"CZX"	6533629	"Ceftizoxime"	"Cephalosporins (3rd gen.)"	"J01DD07"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"cfzx,ctz,cz,czx,tiz,zox"	"cefizox,ceftisomin,ceftix,ceftizoxima,ceftizoxime,ceftizoximum,epocelin,eposerin"			4	"g"	"136-2,137-0,138-8,139-6,18894-6,20378-6,23622-4,25243-7,3450-4,6997-1"
 "CZP"	9578661	"Ceftizoxime alapivoxil"	"Cephalosporins (3rd gen.)"	"NA"			""	""					""
-"BPR"	135413542	"Ceftobiprole"	"Cephalosporins (5th gen.)"	"NA"			""	"ceftobiprole"					""
+"BPR"	135413542	"Ceftobiprole"	"Cephalosporins (5th gen.)"	"NA"			""	"ceftobiprole"					"43269-0,43270-8,43271-6,43272-4,85052-9"
 "CFM1"	135413544	"Ceftobiprole medocaril"	"Cephalosporins (5th gen.)"	"J01DI01"	"Other beta-lactam antibacterials"	"Other cephalosporins and penems"	""	""			1.5	"g"	""
-"CZT"	86291594	"Ceftolozane/tazobactam"	"Cephalosporins (5th gen.)"	"J01DI54"	"Other beta-lactam antibacterials"	"Other cephalosporins and penems"	"CEI"	"zerbaxa"			3	"g"	""
-"CRO"	5479530	"Ceftriaxone"	"Cephalosporins (3rd gen.)"	"J01DD04"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"axo,cax,cftr,cro,ctr,frx,tx"	"biotrakson,cefatriaxone,cefatriaxone hydrate,ceftriaxon,ceftriaxona,ceftriaxone,ceftriaxone sodium,ceftriaxonum,ceftriazone,cephtriaxone,longacef,rocefin,rocephalin,rocephin,rocephine,rophex"			2	"g"	"25244-5,3451-2,80957-4"
+"CZT"	86291594	"Ceftolozane/tazobactam"	"Cephalosporins (5th gen.)"	"J01DI54"	"Other beta-lactam antibacterials"	"Other cephalosporins and penems"	"CEI"	"zerbaxa"			3	"g"	"101484-4,73602-5,73624-9,73647-0,87735-7"
+"CRO"	5479530	"Ceftriaxone"	"Cephalosporins (3rd gen.)"	"J01DD04"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"axo,cax,cftr,cro,ctr,frx,tx"	"biotrakson,cefatriaxone,cefatriaxone hydrate,ceftriaxon,ceftriaxona,ceftriaxone,ceftriaxone sodium,ceftriaxonum,ceftriazone,cephtriaxone,longacef,rocefin,rocephalin,rocephin,rocephine,rophex"			2	"g"	"101485-1,140-4,141-2,142-0,143-8,18895-3,25244-5,25367-4,31140-7,31141-5,3451-2,41681-8,41682-6,41683-4,41732-9,50633-7,55190-3,6998-9,80957-4"
 "CEB"		"Ceftriaxone/beta-lactamase inhibitor"	"Cephalosporins (3rd gen.)"	"J01DD63"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	""	""			2	"g"	""
-"CXM"	5479529	"Cefuroxime"	"Cephalosporins (2nd gen.)"	"J01DC02,S01AA27"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cfrx,cfur,cfx,crm,cxm,fur,rox,xm"	"biofuroksym,cefuril,cefuroxim,cefuroxima,cefuroxime,cefuroxime acid,cefuroximine,cefuroximo,cefuroximum,cephuroxime,kefurox,sharox,zinacef,zinacef danmark"	0.5	"g"	3	"g"	"25245-2,3452-0,80608-3,80617-4"
+"CXM"	5479529	"Cefuroxime"	"Cephalosporins (2nd gen.)"	"J01DC02,S01AA27"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"cfrx,cfur,cfx,crm,cxm,fur,rox,xm"	"biofuroksym,cefuril,cefuroxim,cefuroxima,cefuroxime,cefuroxime acid,cefuroximine,cefuroximo,cefuroximum,cephuroxime,kefurox,sharox,zinacef,zinacef danmark"	0.5	"g"	3	"g"	"101503-1,144-6,145-3,146-1,147-9,18896-1,20460-2,25245-2,3452-0,35782-2,35783-0,51724-3,51774-8,55653-0,55654-8,6999-7,74699-0,80608-3,80617-4"
 "CXA"	6321416	"Cefuroxime axetil"	"Cephalosporins (2nd gen.)"	"NA"			"cfax"	"altacef,bioracef,cefaks,cefazine,ceftin,cefurax,cefuroximaxetil,cefuroxime,cefuroxime axetil,celocid,cepazine,cethixim,cetoxil,coliofossim,elobact,forcef,furoxime,kalcef,maxitil,medoxm,nivador,novador,novocef,oraxim,zinnat"					""
 "CFM2"		"Cefuroxime/metronidazole"	"Other antibacterials"	"J01RA03"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "ZON"	6336505	"Cefuzonam"	"Other antibacterials"	"NA"			""	"cefuzonam,cefuzonam sodium,cefuzoname,cefuzonamum"					""
-"CED"	38103	"Cephradine"	"Cephalosporins (1st gen.)"	"J01DB09"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfra,cfrd"	"anspor,cefradin,cefradina,cefradine,cefradine hydrate,cefradinum,cekodin,cephradin,cephradine,cephradine anhydrous,cephradine hydrate,eskacef,infexin,megace f,megacef,sefril,velocef,velosef"	2	"g"	2	"g"	""
+"CED"	38103	"Cephradine"	"Cephalosporins (1st gen.)"	"J01DB09"	"Other beta-lactam antibacterials"	"First-generation cephalosporins"	"cfra,cfrd"	"anspor,cefradin,cefradina,cefradine,cefradine hydrate,cefradinum,cekodin,cephradin,cephradine,cephradine anhydrous,cephradine hydrate,eskacef,infexin,megace f,megacef,sefril,velocef,velosef"	2	"g"	2	"g"	"168-5,169-3,170-1,171-9,18902-7,55646-4"
 "CTO"	71402	"Cetocycline"	"Tetracyclines"	"NA"			""	"cetocycline,cetocyline,cetotetrine,chelocardin"					""
-"CHL"	5959	"Chloramphenicol"	"Amphenicols"	"D06AX02,D10AF03,G01AA05,J01BA01,S01AA01,S02AA01,S03AA08"	"Amphenicols"	"Amphenicols"	"c,chl,chlo,cl"	"alficetyn,ambofen,amphenicol,amphicol,amseclor,anacetin,aquamycetin,austracil,austracol,biocetin,biophenicol,catilan,ch loramex,chemiceticol,chemicetin,chemicetina,chlomin,chlomycol,chloramex,chloramfenikol,chloramficin,chloramfilin,chloramphenicol,chloramphenicole,chloramphenicolum,chloramsaar,chlorasol,chlorbiotic,chloricol,chlormycetin r,chlornitromycin,chloroamphenicol,chlorocaps,chlorocid,chlorocid s,chlorocide,chlorocidin c,chlorocidin c tetran,chlorocin,chlorocol,chlorofair,chloroject l,chloromax,chloromycetin,chloromycetny,chloromyxin,chloronitrin,chloroptic,chloroptic s.o.p,chloroptic s.o.p.,chlorovules,chlorsig,cidocetine,ciplamycetin,cloramfen,cloramfenicol,cloramfenicolo,cloramficin,cloramical,cloramicol,cloramidina,cloranfenicol,cloroamfenicolo,clorocyn,cloromisan,cloromissan,clorosintex,comycetin,cylphenicol,desphen,detreomycin,detreomycine,dextromycetin,doctamicina,duphenicol,econochlor,embacetin,emetren,enicol,enteromycetin,erbaplast,ertilen,f armicetina,farmicetina,fenicol,globenicol,glorous,gloveticol,halcetin,halomycetin,hortfenicol,interomycetine,intramycetin,intramyctin,isicetin,ismicetina,isophenicol,isopto fenicol,juvamycetin,kamaver,kemicetina,kemicetine,kloramfenikol,klorita,klorocid s,laevomycetinum,leukamycin,leukomyan,leukomycin,levocin,levomicetina,levomitsetin,levomycetin,levoplast,levosin,levovetin,loromicetina,loromisan,loromisin,mastiphen,mediamycetine,medichol,micloretin,micochlorine,micoclorina,microcetina,mychel,mycinol,myclocin,mycochlorin,myscel,normimycin v,novochlorocap,novomycetin,novophenicol,ocuphenicol,oftalent,oleomycetin,opclor,opelor,ophthochlor,ophthocort,ophtochlor,optomycin,otachron,otophen,pantovernil,paraxin,pentamycetin,quemicetina,rivomycin,romphenil,ronfenil,ronphenil,septicol,sificetina,sintomicetin,sintomicetina,sintomicetine r,sno phenicol,soluthor,stanomycetin,synthomycetin,synthomycetine,synthomycine,syntomycin,tevcocin,tevcosin,tifomycin,tifomycine,tiromycetin,treomicetina,tyfomycine,unimycetin,veticol,vice ton,viceton"	3	"g"	3	"g"	"15101-9,16603-3,16604-1,25247-8,29214-4,29346-4,29347-2,3455-3"
-"CTE"	54675777	"Chlortetracycline"	"Tetracyclines"	"A01AB21,D06AA02,J01AA03,S01AA02"	"Tetracyclines"	"Tetracyclines"	""	"acronize,aueromycin,aureocina,aureomycin,aureomykoin,biomitsin,biomycin,biomycin a,chlormax,chlorotetracycline,chlortetracycline,chlortetracyclinum,chrysomykine,clortetraciclina,duomycin,flamycin,uromycin"	1	"g"			"87600-3"
+"CHL"	5959	"Chloramphenicol"	"Amphenicols"	"D06AX02,D10AF03,G01AA05,J01BA01,S01AA01,S02AA01,S03AA08"	"Amphenicols"	"Amphenicols"	"c,chl,chlo,cl"	"alficetyn,ambofen,amphenicol,amphicol,amseclor,anacetin,aquamycetin,austracil,austracol,biocetin,biophenicol,catilan,ch loramex,chemiceticol,chemicetin,chemicetina,chlomin,chlomycol,chloramex,chloramfenikol,chloramficin,chloramfilin,chloramphenicol,chloramphenicole,chloramphenicolum,chloramsaar,chlorasol,chlorbiotic,chloricol,chlormycetin r,chlornitromycin,chloroamphenicol,chlorocaps,chlorocid,chlorocid s,chlorocide,chlorocidin c,chlorocidin c tetran,chlorocin,chlorocol,chlorofair,chloroject l,chloromax,chloromycetin,chloromycetny,chloromyxin,chloronitrin,chloroptic,chloroptic s.o.p,chloroptic s.o.p.,chlorovules,chlorsig,cidocetine,ciplamycetin,cloramfen,cloramfenicol,cloramfenicolo,cloramficin,cloramical,cloramicol,cloramidina,cloranfenicol,cloroamfenicolo,clorocyn,cloromisan,cloromissan,clorosintex,comycetin,cylphenicol,desphen,detreomycin,detreomycine,dextromycetin,doctamicina,duphenicol,econochlor,embacetin,emetren,enicol,enteromycetin,erbaplast,ertilen,f armicetina,farmicetina,fenicol,globenicol,glorous,gloveticol,halcetin,halomycetin,hortfenicol,interomycetine,intramycetin,intramyctin,isicetin,ismicetina,isophenicol,isopto fenicol,juvamycetin,kamaver,kemicetina,kemicetine,kloramfenikol,klorita,klorocid s,laevomycetinum,leukamycin,leukomyan,leukomycin,levocin,levomicetina,levomitsetin,levomycetin,levoplast,levosin,levovetin,loromicetina,loromisan,loromisin,mastiphen,mediamycetine,medichol,micloretin,micochlorine,micoclorina,microcetina,mychel,mycinol,myclocin,mycochlorin,myscel,normimycin v,novochlorocap,novomycetin,novophenicol,ocuphenicol,oftalent,oleomycetin,opclor,opelor,ophthochlor,ophthocort,ophtochlor,optomycin,otachron,otophen,pantovernil,paraxin,pentamycetin,quemicetina,rivomycin,romphenil,ronfenil,ronphenil,septicol,sificetina,sintomicetin,sintomicetina,sintomicetine r,sno phenicol,soluthor,stanomycetin,synthomycetin,synthomycetine,synthomycine,syntomycin,tevcocin,tevcosin,tifomycin,tifomycine,tiromycetin,treomicetina,tyfomycine,unimycetin,veticol,vice ton,viceton"	3	"g"	3	"g"	"15101-9,16603-3,16604-1,172-7,173-5,174-3,175-0,18903-5,25247-8,29214-4,29346-4,29347-2,3455-3,7001-1"
+"CTE"	54675777	"Chlortetracycline"	"Tetracyclines"	"A01AB21,D06AA02,J01AA03,S01AA02"	"Tetracyclines"	"Tetracyclines"	""	"acronize,aueromycin,aureocina,aureomycin,aureomykoin,biomitsin,biomycin,biomycin a,chlormax,chlorotetracycline,chlortetracycline,chlortetracyclinum,chrysomykine,clortetraciclina,duomycin,flamycin,uromycin"	1	"g"			"176-8,177-6,178-4,179-2,18904-3,55655-5,87600-3"
 "CIC"	19003	"Ciclacillin"	"Beta-lactams/penicillins"	"NA"			""	"bastcillin,calthor,ciclacilina,ciclacillin,ciclacilline,ciclacillinum,ciclacillum,citosarin,cyclacillin,cyclapen,noblicil,orfilina,peamezin,syngacillin,ultracillin,vastcillin,vipicil,wyvital"					""
 "CIX"	47472	"Ciclopirox"	"Antifungals/antimycotics"	"D01AE14,G01AX12"	"Antifungals for topical use"	"Other antifungals for topical use"	"cipx"	"butaconazole,butoconazol,butoconazole,butoconazolum,ciclodan,ciclopirox,ciclopirox gel,ciclopirox olamin,ciclopiroxum,compositenstarke,dahlin,femstat,gynofort,loprox,loprox cream,loprox gel,penlac,polyfructosanum,stieprox"					""
-"CIN"	2762	"Cinoxacin"	"Quinolones"	"J01MB06"	"Quinolone antibacterials"	"Other quinolones"	"cino,cnox"	"azolinic acid,cinobac,cinobactin,cinoxacin,cinoxacine,cinoxacino,cinoxacinum,clinoxacin,noxigram,uronorm"	1	"g"			""
-"CIP"	2764	"Ciprofloxacin"	"Quinolones"	"J01MA02,S01AE03,S02AA15,S03AA07"	"Quinolone antibacterials"	"Fluoroquinolones"	"ci,cip,cipr,cp"	"alcon cilox,auripro,bacquinor,baflox,baycip,bernoflox,cetraxal,ciflox,cifloxin,ciloxan,ciplus,ciprecu,ciprine,ciprinol,cipro i.v.,cipro iv,cipro xl,cipro xr,ciprobay,ciprobay uro,ciprocinol,ciprodar,ciproflox,ciprofloxacin,ciprofloxacina,ciprofloxacine,ciprofloxacino,ciprofloxacinum,ciprogis,ciprolin,ciprolon,cipromycin,ciproquinol,ciprowin,ciproxan,ciproxin,ciproxina,ciproxine,ciriax,citopcin,corsacin,cyprobay,fimoflox,flociprin,ipiflox,italnik,linhaliq,otiprio,probiox,proflaxin,quinolid,quintor,rancif,roxytal,septicide,sophixin ofteno,spitacin,superocin,velmonit,velomonit,zumaflox"	1	"g"	0.8	"g"	"14031-9,14032-7,14058-2,14059-0,25248-6,34636-1,3484-3"
+"CIN"	2762	"Cinoxacin"	"Quinolones"	"J01MB06"	"Quinolone antibacterials"	"Other quinolones"	"cino,cnox"	"azolinic acid,cinobac,cinobactin,cinoxacin,cinoxacine,cinoxacino,cinoxacinum,clinoxacin,noxigram,uronorm"	1	"g"			"180-0,181-8,182-6,183-4,18905-0,55656-3"
+"CIP"	2764	"Ciprofloxacin"	"Quinolones"	"J01MA02,S01AE03,S02AA15,S03AA07"	"Quinolone antibacterials"	"Fluoroquinolones"	"ci,cip,cipr,cp"	"alcon cilox,auripro,bacquinor,baflox,baycip,bernoflox,cetraxal,ciflox,cifloxin,ciloxan,ciplus,ciprecu,ciprine,ciprinol,cipro i.v.,cipro iv,cipro xl,cipro xr,ciprobay,ciprobay uro,ciprocinol,ciprodar,ciproflox,ciprofloxacin,ciprofloxacina,ciprofloxacine,ciprofloxacino,ciprofloxacinum,ciprogis,ciprolin,ciprolon,cipromycin,ciproquinol,ciprowin,ciproxan,ciproxin,ciproxina,ciproxine,ciriax,citopcin,corsacin,cyprobay,fimoflox,flociprin,ipiflox,italnik,linhaliq,otiprio,probiox,proflaxin,quinolid,quintor,rancif,roxytal,septicide,sophixin ofteno,spitacin,superocin,velmonit,velomonit,zumaflox"	1	"g"	0.8	"g"	"101500-7,14031-9,14032-7,14058-2,14059-0,184-2,185-9,186-7,187-5,18906-8,20377-8,23621-6,25180-1,25181-9,25188-4,25189-2,25248-6,34636-1,3484-3,42644-5,55194-5,7002-9"
 "CIM"		"Ciprofloxacin/metronidazole"	"Other antibacterials"	"J01RA10"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "CIO"		"Ciprofloxacin/ornidazole"	"Other antibacterials"	"J01RA12"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "CIT"		"Ciprofloxacin/tinidazole"	"Other antibacterials"	"J01RA11"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
-"CLR"	84029	"Clarithromycin"	"Macrolides/lincosamides"	"J01FA09"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"ch,cla,clar,clm,clr"	"abbotic,astromen,biaxin,biaxin filmtab,biaxin hp,biaxin xl,biaxin xl filmtab,bicrolid,clacee,clacid,clacine,clambiotic,clarem,claribid,claricide,claridar,claripen,clarith,clarithromycin,clarithromycine,clarithromycinum,claritromicina,clathromycin,crixan,cyllid,cyllind,fromilid,heliclar,klabax,klacid,klaciped,klaricid,klaricid h.p,klaricid h.p.,klaricid pediatric,klaricid xl,klarid,klarin,kofron,mabicrol,macladin,maclar,prevpac,veclam,vikrol,zeclar"	0.5	"g"	1	"g"	"16619-9,25253-6,34638-7,80559-8"
+"CLR"	84029	"Clarithromycin"	"Macrolides/lincosamides"	"J01FA09"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"ch,cla,clar,clm,clr"	"abbotic,astromen,biaxin,biaxin filmtab,biaxin hp,biaxin xl,biaxin xl filmtab,bicrolid,clacee,clacid,clacine,clambiotic,clarem,claribid,claricide,claridar,claripen,clarith,clarithromycin,clarithromycine,clarithromycinum,claritromicina,clathromycin,crixan,cyllid,cyllind,fromilid,heliclar,klabax,klacid,klaciped,klaricid,klaricid h.p,klaricid h.p.,klaricid pediatric,klaricid xl,klarid,klarin,kofron,mabicrol,macladin,maclar,prevpac,veclam,vikrol,zeclar"	0.5	"g"	1	"g"	"100048-8,16619-9,16620-7,188-3,189-1,18907-6,190-9,191-7,20375-2,23619-0,25190-0,25191-8,25192-6,25253-6,34638-7,43987-7,43990-1,43991-9,7003-7,80559-8,89485-7"
 "CLA1"	5280980	"Clavulanic acid"	"Other antibacterials"	"NA"			""	"acide clavulanique,acido clavulanico,acidum clavulanicum,clavulanate,clavulanate acid,clavulanate lithium,clavulanateacid,clavulanic acid,clavulansaeure,clavulansaure,clavulinic acid,clavulox,serdaxin,sodium clavulanate"					""
-"CLX"	60063	"Clinafloxacin"	"Quinolones"	"NA"			""	"clinafloxacin"					""
-"CLI"	446598	"Clindamycin"	"Macrolides/lincosamides"	"D10AF01,G01AA10,J01FF01"	"Macrolides, lincosamides and streptogramins"	"Lincosamides"	"cc,cd,cli,clin,cm,da"	"antirobe,chlolincocin,clindaderm,clindamicina,clindamycin,clindamycine,clindamycinum,clinimycin,dalacin c,dalacine,klimicin,sobelin"	1.2	"g"	1.8	"g"	"16621-5,16622-3,25249-4,3486-8"
-"CLF"	2794	"Clofazimine"	"Antimycobacterials"	"J04BA01"	"Drugs for treatment of lepra"	"Drugs for treatment of lepra"	"clof"	"chlofazimine,clofazimin,clofazimina,clofazimine,clofaziminum,colfazimine,lampren,lamprene,riminophenazine"	0.1	"g"			""
+"CLX"	60063	"Clinafloxacin"	"Quinolones"	"NA"			""	"clinafloxacin"					"32376-6,33284-1,35785-5,35786-3,7004-5"
+"CLI"	446598	"Clindamycin"	"Macrolides/lincosamides"	"D10AF01,G01AA10,J01FF01"	"Macrolides, lincosamides and streptogramins"	"Lincosamides"	"cc,cd,cli,clin,cm,da"	"antirobe,chlolincocin,clindaderm,clindamicina,clindamycin,clindamycine,clindamycinum,clinimycin,dalacin c,dalacine,klimicin,sobelin"	1.2	"g"	1.8	"g"	"16621-5,16622-3,18908-4,192-5,193-3,194-1,195-8,25249-4,3486-8,42720-3,55657-1,55658-9,55659-7,55660-5,61188-9,7005-2"
+"CLF"	2794	"Clofazimine"	"Antimycobacterials"	"J04BA01"	"Drugs for treatment of lepra"	"Drugs for treatment of lepra"	"clof"	"chlofazimine,clofazimin,clofazimina,clofazimine,clofaziminum,colfazimine,lampren,lamprene,riminophenazine"	0.1	"g"			"16623-1,20376-0,23620-8,23627-3,43986-9,43988-5,43989-3,55661-3,55662-1,96108-6"
 "CLF1"	2799	"Clofoctol"	"Other antibacterials"	"J01XX03"	"Other antibacterials"	"Other antibacterials"	""	"clofoctol,clofoctolo,clofoctolum,gramplus,octofene"					""
 "CLM"	71807	"Clometocillin"	"Beta-lactams/penicillins"	"J01CE07"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"chlomethocillin,clometacillin,clometocilina,clometocillin,clometocilline,clometocillinum,rixapen"	1	"g"			""
 "CLM1"	54680675	"Clomocycline"	"Tetracyclines"	"J01AA11"	"Tetracyclines"	"Tetracyclines"	""	"chlormethylencycline,clomociclina,clomocyclin,clomocycline,clomocyclinum,megaclor"	1	"g"			""
-"CTR"	2812	"Clotrimazole"	"Antifungals/antimycotics"	"A01AB18,D01AC01,G01AF02"			"clot"	"canesten,canesten cream,canesten solution,canestene,canestine,canifug,chlotrimazole,cimitidine,clomatin,clotrimaderm,clotrimaderm cream,clotrimazol,clotrimazole,clotrimazolum,cutistad,desamix f,diphenylmethane,empecid,esparol,fem care,femcare,gyne lotrimin,jidesheng,kanesten,klotrimazole,lotrimax,lotrimin,lotrimin af,lotrimin af cream,lotrimin af lotion,lotrimin af solution,lotrimin cream,lotrimin lotion,lotrimin solution,monobaycuten,mycelax,mycelex,mycelex cream,mycelex g,mycelex otc,mycelex solution,mycelex troches,mycelex twin pack,myclo cream,myclo solution,myclo spray solution,mycofug,mycosporin,mykosporin,nalbix,otomax,pedisafe,rimazole,stiemazol,tibatin,trimysten,trivagizole,veltrim"					""
-"CLO"	6098	"Cloxacillin"	"Beta-lactams/penicillins"	"J01CF02"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"clox"	"chloroxacillin,clossacillina,cloxacilina,cloxacillin,cloxacillin sodium,cloxacilline,cloxacillinna,cloxacillinum,cloxapen,methocillin s,orbenin,syntarpen,tegopen"	2	"g"	2	"g"	"16628-0,25250-2"
-"COL"	5311054	"Colistin"	"Polymyxins"	"A07AA10,J01XB01"	"Other antibacterials"	"Polymyxins"	"cl,coli,cs,cst,ct"	"belcomycine,colimycin,colimycin sulphate,colisticin,colistimethate,colistimethate sodium,colistin sulfate,colistin sulphate,colobreathe,colomycin,coly-mycin,polymyxin e,polymyxin e. sulfate,promixin,totazina"	9	"MU"	9	"MU"	"16645-4,29493-4"
+"CTR"	2812	"Clotrimazole"	"Antifungals/antimycotics"	"A01AB18,D01AC01,G01AF02"			"clot"	"canesten,canesten cream,canesten solution,canestene,canestine,canifug,chlotrimazole,cimitidine,clomatin,clotrimaderm,clotrimaderm cream,clotrimazol,clotrimazole,clotrimazolum,cutistad,desamix f,diphenylmethane,empecid,esparol,fem care,femcare,gyne lotrimin,jidesheng,kanesten,klotrimazole,lotrimax,lotrimin,lotrimin af,lotrimin af cream,lotrimin af lotion,lotrimin af solution,lotrimin cream,lotrimin lotion,lotrimin solution,monobaycuten,mycelax,mycelex,mycelex cream,mycelex g,mycelex otc,mycelex solution,mycelex troches,mycelex twin pack,myclo cream,myclo solution,myclo spray solution,mycofug,mycosporin,mykosporin,nalbix,otomax,pedisafe,rimazole,stiemazol,tibatin,trimysten,trivagizole,veltrim"					"10653-4,10654-2,18909-2,54177-1,55663-9"
+"CLO"	6098	"Cloxacillin"	"Beta-lactams/penicillins"	"J01CF02"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"clox"	"chloroxacillin,clossacillina,cloxacilina,cloxacillin,cloxacillin sodium,cloxacilline,cloxacillinna,cloxacillinum,cloxapen,methocillin s,orbenin,syntarpen,tegopen"	2	"g"	2	"g"	"16628-0,18910-0,196-6,197-4,198-2,199-0,25250-2,55664-7"
+"COL"	5311054	"Colistin"	"Polymyxins"	"A07AA10,J01XB01"	"Other antibacterials"	"Polymyxins"	"cl,coli,cs,cst,ct"	"belcomycine,colimycin,colimycin sulphate,colisticin,colistimethate,colistimethate sodium,colistin sulfate,colistin sulphate,colobreathe,colomycin,coly-mycin,polymyxin e,polymyxin e. sulfate,promixin,totazina"	9	"MU"	9	"MU"	"16645-4,18912-6,204-8,205-5,206-3,207-1,29493-4,33333-6"
 "COP"		"Colistin/polysorbate"	"Other antibacterials"	"NA"			""	""					""
-"CYC"	6234	"Cycloserine"	"Oxazolidinones"	"J04AB01"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"cycl"	"cicloserina,closerin,closina,cyclorin,cycloserin,cycloserine,cycloserinum,farmiserina,micoserina,miroserina,miroseryn,novoserin,oxamicina,oxamycin,seromycin,tebemicina,tisomycin,wasserina"	0.75	"g"			"16702-3,25251-0,3519-6"
-"DAL"	23724878	"Dalbavancin"	"Glycopeptides"	"J01XA04"	"Other antibacterials"	"Glycopeptide antibacterials"	"dalb"	"dalbavancin,dalvance"			1.5	"g"	""
-"DAN"	71335	"Danofloxacin"	"Quinolones"	"NA"			""	"advocin,danofloxacin,danofloxacine,danofloxacino,danofloxacinum"					""
-"DPS"	2955	"Dapsone"	"Other antibacterials"	"D10AX05,J04BA02"	"Drugs for treatment of lepra"	"Drugs for treatment of lepra"	""	"aczone,araldite ht,atrisone,avlosulfon,avlosulfone,avlosulphone,avsulfor,bis sulfone,bissulfone,bissulphone,croysulfone,croysulphone,dapson,dapsona,dapsone,dapsonum,di sulfone,diaphenyl sulfone,diaphenylsulfon,diaphenylsulfone,diaphenylsulphon,diaphenylsulphone,dimitone,diphenasone,diphone,disulfone,disulone,disulphone,dubronax,dubronaz,dumitone,eporal,metabolite c,novophone,protogen,servidapson,slphadione,sulfadione,sulfona,sulfone ucb,sulfonyldianiline,sulphadione,sulphonyldianiline,sumicure s,tarimyl,udolac"	50	"mg"			"9747-7"
-"DAP"	16134395	"Daptomycin"	"Other antibacterials"	"J01XX09"	"Other antibacterials"	"Other antibacterials"	"dap,dapt"	"cidecin,cubicin,dapcin,daptomicina,daptomycine,daptomycinum"			0.28	"g"	""
-"DFX"	487101	"Delafloxacin"	"Quinolones"	"J01MA23"			""	"baxdela,delafloxacin,delafloxacinum,quofenix"	0.9	"g"	0.6	"g"	""
-"DLM"	6480466	"Delamanid"	"Antimycobacterials"	"J04AK06"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"dela"	"delamanid,deltyba"	0.2	"g"			""
-"DEM"	54680690	"Demeclocycline"	"Tetracyclines"	"D06AA01,J01AA01"	"Tetracyclines"	"Tetracyclines"	""	"bioterciclin,clortetrin,declomycin,deganol,demeclociclina,demeclocycline,demeclocyclinum,demeclor,demetraclin,diuciclin,elkamicina,ledermycin,mexocine,novotriclina,perciclina,sumaclina"	0.6	"g"			"10982-7,29494-2"
-"DKB"	470999	"Dibekacin"	"Aminoglycosides"	"J01GB09"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	""	"debecacin,dibekacin,dibekacin sulfate,dibekacina,dibekacine,dibekacinum,dideoxykanamycin b,kappati,orbicin,panamicin"			0.14	"g"	""
-"DIC"	18381	"Dicloxacillin"	"Beta-lactams/penicillins"	"J01CF01"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"dicl"	"dichloroxacillin,diclossacillina,dicloxaciclin,dicloxacilin,dicloxacilina,dicloxacillin,dicloxacillin sodium,dicloxacillina,dicloxacilline,dicloxacillinum,dicloxacycline,dycill,dynapen,maclicine,nm|| dicloxacillin,pathocil"	2	"g"	2	"g"	"10984-3,16769-2,25252-8"
-"DIF"	56206	"Difloxacin"	"Quinolones"	"NA"			""	"dicural,difloxacin,pulsaflox"					""
-"DIR"	6473883	"Dirithromycin"	"Macrolides/lincosamides"	"J01FA13"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"dirithromycin,dirithromycine,dirithromycinum,diritromicina,divitross,dynabac,noriclan,valodin"	0.5	"g"			""
-"DOR"	73303	"Doripenem"	"Carbapenems"	"J01DH04"	"Other beta-lactam antibacterials"	"Carbapenems"	"dori"	"doribax,doripenem,doripenem hydrate,finibax"			1.5	"g"	""
-"DOX"	54671203	"Doxycycline"	"Tetracyclines"	"A01AB22,J01AA02"	"Tetracyclines"	"Tetracyclines"	"dox,doxy"	"atridox,azudoxat,deoxymykoin,dossiciclina,doxcycline anhydrous,doxiciclina,doxirobe,doxitard,doxivetin,doxycen,doxychel,doxycin,doxycyclin,doxycycline,doxycycline calcium,doxycycline hyclate,doxycyclinum,doxylin,doxysol,doxytec,doxytetracycline,hydramycin,investin,jenacyclin,liviatin,monodox,oracea,periostat,ronaxan,spanor,supracyclin,vibramycin,vibramycin novum,vibramycine,vibravenos,zenavod"	0.1	"g"	0.1	"g"	"10986-8,21250-6,26902-7"
-"ECO"	3198	"Econazole"	"Antifungals/antimycotics"	"D01AC03,G01AF05"	"Antifungals for topical use"	"Imidazole and triazole derivatives"	"econ"	"econazol,econazole,econazolum,ecostatin,ecostatin cream,palavale,pevaryl,spectazole,spectazole cream"					""
-"ENX"	3229	"Enoxacin"	"Quinolones"	"J01MA04"	"Quinolone antibacterials"	"Fluoroquinolones"	"enox"	"almitil,bactidan,bactidron,comprecin,enofloxacine,enoksetin,enoram,enoxacin,enoxacina,enoxacine,enoxacino,enoxacinum,enoxen,enoxin,enoxor,flumark,penetrex"	0.8	"g"			"16816-1,3590-7"
-"ENR"	71188	"Enrofloxacin"	"Quinolones"	"NA"			""	"baytril,enrofloxacin,enrofloxacine,enrofloxacino,enrofloxacinum,enroxil"					""
+"CYC"	6234	"Cycloserine"	"Oxazolidinones"	"J04AB01"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"cycl"	"cicloserina,closerin,closina,cyclorin,cycloserin,cycloserine,cycloserinum,farmiserina,micoserina,miroserina,miroseryn,novoserin,oxamicina,oxamycin,seromycin,tebemicina,tisomycin,wasserina"	0.75	"g"			"16702-3,18914-2,212-1,213-9,214-7,215-4,23608-3,25207-2,25208-0,25209-8,25251-0,3519-6,55667-0"
+"DAL"	23724878	"Dalbavancin"	"Glycopeptides"	"J01XA04"	"Other antibacterials"	"Glycopeptide antibacterials"	"dalb"	"dalbavancin,dalvance"			1.5	"g"	"41688-3,41689-1,41690-9,41734-5"
+"DAN"	71335	"Danofloxacin"	"Quinolones"	"NA"			""	"advocin,danofloxacin,danofloxacine,danofloxacino,danofloxacinum"					"73601-7,73623-1,73646-2"
+"DPS"	2955	"Dapsone"	"Other antibacterials"	"D10AX05,J04BA02"	"Drugs for treatment of lepra"	"Drugs for treatment of lepra"	""	"aczone,araldite ht,atrisone,avlosulfon,avlosulfone,avlosulphone,avsulfor,bis sulfone,bissulfone,bissulphone,croysulfone,croysulphone,dapson,dapsona,dapsone,dapsonum,di sulfone,diaphenyl sulfone,diaphenylsulfon,diaphenylsulfone,diaphenylsulphon,diaphenylsulphone,dimitone,diphenasone,diphone,disulfone,disulone,disulphone,dubronax,dubronaz,dumitone,eporal,metabolite c,novophone,protogen,servidapson,slphadione,sulfadione,sulfona,sulfone ucb,sulfonyldianiline,sulphadione,sulphonyldianiline,sumicure s,tarimyl,udolac"	50	"mg"			"51698-9,9747-7"
+"DAP"	16134395	"Daptomycin"	"Other antibacterials"	"J01XX09"	"Other antibacterials"	"Other antibacterials"	"dap,dapt"	"cidecin,cubicin,dapcin,daptomicina,daptomycine,daptomycinum"			0.28	"g"	"35787-1,35788-9,35789-7,41691-7"
+"DFX"	487101	"Delafloxacin"	"Quinolones"	"J01MA23"			""	"baxdela,delafloxacin,delafloxacinum,quofenix"	0.9	"g"	0.6	"g"	"88885-9,90447-4,93790-4"
+"DLM"	6480466	"Delamanid"	"Antimycobacterials"	"J04AK06"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"dela"	"delamanid,deltyba"	0.2	"g"			"93851-4,96109-4"
+"DEM"	54680690	"Demeclocycline"	"Tetracyclines"	"D06AA01,J01AA01"	"Tetracyclines"	"Tetracyclines"	""	"bioterciclin,clortetrin,declomycin,deganol,demeclociclina,demeclocycline,demeclocyclinum,demeclor,demetraclin,diuciclin,elkamicina,ledermycin,mexocine,novotriclina,perciclina,sumaclina"	0.6	"g"			"10982-7,18915-9,216-2,217-0,218-8,219-6,29494-2,7006-0"
+"DKB"	470999	"Dibekacin"	"Aminoglycosides"	"J01GB09"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	""	"debecacin,dibekacin,dibekacin sulfate,dibekacina,dibekacine,dibekacinum,dideoxykanamycin b,kappati,orbicin,panamicin"			0.14	"g"	"55669-6,55670-4,55671-2,55672-0"
+"DIC"	18381	"Dicloxacillin"	"Beta-lactams/penicillins"	"J01CF01"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"dicl"	"dichloroxacillin,diclossacillina,dicloxaciclin,dicloxacilin,dicloxacilina,dicloxacillin,dicloxacillin sodium,dicloxacillina,dicloxacilline,dicloxacillinum,dicloxacycline,dycill,dynapen,maclicine,nm|| dicloxacillin,pathocil"	2	"g"	2	"g"	"10984-3,16769-2,18916-7,220-4,221-2,222-0,223-8,25252-8,32380-8,55668-8"
+"DIF"	56206	"Difloxacin"	"Quinolones"	"NA"			""	"dicural,difloxacin,pulsaflox"					"35790-5,35791-3,35792-1"
+"DIR"	6473883	"Dirithromycin"	"Macrolides/lincosamides"	"J01FA13"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"dirithromycin,dirithromycine,dirithromycinum,diritromicina,divitross,dynabac,noriclan,valodin"	0.5	"g"			"35793-9,35794-7,35795-4,7007-8"
+"DOR"	73303	"Doripenem"	"Carbapenems"	"J01DH04"	"Other beta-lactam antibacterials"	"Carbapenems"	"dori"	"doribax,doripenem,doripenem hydrate,finibax"			1.5	"g"	"56031-8,58711-3,60535-2,72893-1"
+"DOX"	54671203	"Doxycycline"	"Tetracyclines"	"A01AB22,J01AA02"	"Tetracyclines"	"Tetracyclines"	"dox,doxy"	"atridox,azudoxat,deoxymykoin,dossiciclina,doxcycline anhydrous,doxiciclina,doxirobe,doxitard,doxivetin,doxycen,doxychel,doxycin,doxycyclin,doxycycline,doxycycline calcium,doxycycline hyclate,doxycyclinum,doxylin,doxysol,doxytec,doxytetracycline,hydramycin,investin,jenacyclin,liviatin,monodox,oracea,periostat,ronaxan,spanor,supracyclin,vibramycin,vibramycin novum,vibramycine,vibravenos,zenavod"	0.1	"g"	0.1	"g"	"10986-8,18917-5,20379-4,21250-6,224-6,225-3,226-1,227-9,23623-2,25223-9,26902-7,7008-6"
+"ECO"	3198	"Econazole"	"Antifungals/antimycotics"	"D01AC03,G01AF05"	"Antifungals for topical use"	"Imidazole and triazole derivatives"	"econ"	"econazol,econazole,econazolum,ecostatin,ecostatin cream,palavale,pevaryl,spectazole,spectazole cream"					"25595-0,25637-0,54178-9,55673-8"
+"ENX"	3229	"Enoxacin"	"Quinolones"	"J01MA04"	"Quinolone antibacterials"	"Fluoroquinolones"	"enox"	"almitil,bactidan,bactidron,comprecin,enofloxacine,enoksetin,enoram,enoxacin,enoxacina,enoxacine,enoxacino,enoxacinum,enoxen,enoxin,enoxor,flumark,penetrex"	0.8	"g"			"16816-1,18918-3,228-7,229-5,230-3,231-1,3590-7,41692-5"
+"ENR"	71188	"Enrofloxacin"	"Quinolones"	"NA"			""	"baytril,enrofloxacin,enrofloxacine,enrofloxacino,enrofloxacinum,enroxil"					"23712-3,35796-2,35797-0,35798-8"
 "ENV"	135565326	"Enviomycin"	"Antimycobacterials"	"J04AB06"			"tuberactinomycin"	"enviomicina,enviomycin,enviomycina,enviomycinum,tuberactin"					""
 "EPE"		"Eperozolid"	"Other antibacterials"	"NA"			""	""					""
 "EPC"	71392	"Epicillin"	"Beta-lactams/penicillins"	"J01CA07"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"dexacillin,dihydroampicillin,epicilina,epicillin,epicilline,epicillinum"	2	"g"	2	"g"	""
 "EPP"	68916	"Epiroprim"	"Other antibacterials"	"NA"			""	"epiroprim,epiroprima,epiroprime,epiroprimum"					""
-"ERV"	54726192	"Eravacycline"	"Tetracyclines"	"J01AA13"	"Tetracyclines"	"Tetracyclines"	"erav"	"eravacycline,xerava"					""
-"ETP"	150610	"Ertapenem"	"Carbapenems"	"J01DH03"	"Other beta-lactam antibacterials"	"Carbapenems"	"erta,etp"	"ertapenem,invanz"			1	"g"	""
-"ERY"	12560	"Erythromycin"	"Macrolides/lincosamides"	"D10AF02,J01FA01,S01AA17"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"e,em,ery,eryt"	"abboticin,abomacetin,acneryne,acnesol,akne cordes losung,aknederm ery gel,aknemycin,austrias,benzamycin,bristamycin,derimer,deripil,dotycin,dumotrycin,emuvin,emycin,endoeritrin,erecin,erisone,eritomicina,eritrocina,eritromicina,ermycin,eryacne,eryacnen,eryc sprinkles,erycen,erycette,erycin,erycinum,eryderm,erydermer,erygel,eryhexal,erymax,erymed,erypar,erysafe,erytab,erythrocin,erythrocin stearate,erythroderm,erythrogran,erythroguent,erythromid,erythromycin,erythromycin a,erythromycin base,erythromycin lactate,erythromycine,erythromycines,erythromycinum,erytop,erytrociclin,ilocaps,ilosone,iloticina,ilotycin,ilotycin gluceptate,ilotycin t.s.,inderm,inderm gel,indermretcin,latotryd,lederpax,mephamycin,mercina,oftamolets,paediathrocin,pantoderm,pantodrin,pantomicina,pce dispertab,pharyngocin,primacine,propiocine,proterytrin,retcin,robimycin,romycin,sansac,skid gel e,staticin,stiemicyn,stiemycin,theramycin z,tiloryth,tiprocin,torlamicina,udima ery gel,wyamycin s"	2	"g"	1	"g"	"12298-6,16829-4,25275-9,3597-2"
-"ETH"	14052	"Ethambutol"	"Antimycobacterials"	"J04AK02"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"etha"	"aethambutolum,diambutol,ebutol,etambutol,etambutolo,etapiam,ethambutol,ethambutolum,myambutol,mycobutol,purderal,servambutol,tibutol"	1.2	"g"	1.2	"g"	"25404-5,3607-9"
+"ERV"	54726192	"Eravacycline"	"Tetracyclines"	"J01AA13"	"Tetracyclines"	"Tetracyclines"	"erav"	"eravacycline,xerava"					"100049-6,85423-2,93767-2"
+"ETP"	150610	"Ertapenem"	"Carbapenems"	"J01DH03"	"Other beta-lactam antibacterials"	"Carbapenems"	"erta,etp"	"ertapenem,invanz"			1	"g"	"101486-9,35799-6,35800-2,35801-0,35802-8"
+"ERY"	12560	"Erythromycin"	"Macrolides/lincosamides"	"D10AF02,J01FA01,S01AA17"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"e,em,ery,eryt"	"abboticin,abomacetin,acneryne,acnesol,akne cordes losung,aknederm ery gel,aknemycin,austrias,benzamycin,bristamycin,derimer,deripil,dotycin,dumotrycin,emuvin,emycin,endoeritrin,erecin,erisone,eritomicina,eritrocina,eritromicina,ermycin,eryacne,eryacnen,eryc sprinkles,erycen,erycette,erycin,erycinum,eryderm,erydermer,erygel,eryhexal,erymax,erymed,erypar,erysafe,erytab,erythrocin,erythrocin stearate,erythroderm,erythrogran,erythroguent,erythromid,erythromycin,erythromycin a,erythromycin base,erythromycin lactate,erythromycine,erythromycines,erythromycinum,erytop,erytrociclin,ilocaps,ilosone,iloticina,ilotycin,ilotycin gluceptate,ilotycin t.s.,inderm,inderm gel,indermretcin,latotryd,lederpax,mephamycin,mercina,oftamolets,paediathrocin,pantoderm,pantodrin,pantomicina,pce dispertab,pharyngocin,primacine,propiocine,proterytrin,retcin,robimycin,romycin,sansac,skid gel e,staticin,stiemicyn,stiemycin,theramycin z,tiloryth,tiprocin,torlamicina,udima ery gel,wyamycin s"	2	"g"	1	"g"	"100050-4,11576-6,12298-6,16829-4,16830-2,18919-1,18920-9,20380-2,232-9,233-7,234-5,235-2,236-0,23633-1,237-8,238-6,239-4,25224-7,25275-9,3597-2,7009-4"
+"ETH"	14052	"Ethambutol"	"Antimycobacterials"	"J04AK02"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"etha"	"aethambutolum,diambutol,ebutol,etambutol,etambutolo,etapiam,ethambutol,ethambutolum,myambutol,mycobutol,purderal,servambutol,tibutol"	1.2	"g"	1.2	"g"	"100051-2,16841-9,18921-7,20381-0,23625-7,240-2,241-0,242-8,243-6,25187-6,25194-2,25195-9,25230-4,25404-5,3607-9,42645-2,42646-0,55154-9,55674-6,56025-0,7010-2,89491-5"
 "ETI"	456476	"Ethambutol/isoniazid"	"Antimycobacterials"	"J04AM03"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
-"ETI1"	2761171	"Ethionamide"	"Antimycobacterials"	"J04AD03"	"Drugs for treatment of tuberculosis"	"Thiocarbamide derivatives"	"ethi"	"aethionamidum,aetina,aetiva,amidazin,amidazine,ethatyl,ethimide,ethina,ethinamide,ethionamide,ethionamidum,ethioniamide,ethylisothiamide,ethyonomide,etimid,etiocidan,etionamid,etionamida,etionamide,etioniamid,etionid,etionizin,etionizina,etionizine,fatoliamid,iridocin,iridocin bayer,iridozin,isothin,isotiamida,itiocide,nicotion,nisotin,nizotin,rigenicid,sertinon,teberus,thianid,thianide,thioamide,thiodine,thiomid,thioniden,tianid,tiomid,trecator,trecator sc,trekator,trescatyl,trescazide,tubenamide,tubermin,tuberoid,tuberoson"	0.75	"g"			"16845-0"
+"ETI1"	2761171	"Ethionamide"	"Antimycobacterials"	"J04AD03"	"Drugs for treatment of tuberculosis"	"Thiocarbamide derivatives"	"ethi"	"aethionamidum,aetina,aetiva,amidazin,amidazine,ethatyl,ethimide,ethina,ethinamide,ethionamide,ethionamidum,ethioniamide,ethylisothiamide,ethyonomide,etimid,etiocidan,etionamid,etionamida,etionamide,etioniamid,etionid,etionizin,etionizina,etionizine,fatoliamid,iridocin,iridocin bayer,iridozin,isothin,isotiamida,itiocide,nicotion,nisotin,nizotin,rigenicid,sertinon,teberus,thianid,thianide,thioamide,thiodine,thiomid,thioniden,tianid,tiomid,trecator,trecator sc,trekator,trescatyl,trescazide,tubenamide,tubermin,tuberoid,tuberoson"	0.75	"g"			"16099-4,16845-0,18922-5,20382-8,23617-4,25183-5,25196-7,25198-3,25231-2,41693-3,42647-8,42648-6,7011-0,96110-2"
 "ETO"	6034	"Ethopabate"	"Other antibacterials"	"NA"			""	"amprol plus,ethopabat,ethopabate,ethyl pabate"					""
 "EXE"		"Exebacase"		"NA"			""	""					""
-"FAR"	65894	"Faropenem"	"Other antibacterials"	"J01DI03"	"Other beta-lactam antibacterials"	"Other cephalosporins and penems"	""	"faropenem,faropenem sodium,fropenem,fropenum sodium"	0.75	"g"			""
-"FDX"	10034073	"Fidaxomicin"	"Other antibacterials"	"A07AA12"			""	"dificid,dificlir,difimicin,fidaxomicin,lipiarmicin,lipiarmycin,lipiarrmycin,tiacumicin b"	0.4	"g"			""
-"FIN"	11567473	"Finafloxacin"	"Quinolones"	"NA"			""	"finafloxacin"					""
+"FAR"	65894	"Faropenem"	"Other antibacterials"	"J01DI03"	"Other beta-lactam antibacterials"	"Other cephalosporins and penems"	""	"faropenem,faropenem sodium,fropenem,fropenum sodium"	0.75	"g"			"73600-9,73622-3,73645-4"
+"FDX"	10034073	"Fidaxomicin"	"Other antibacterials"	"A07AA12"			""	"dificid,dificlir,difimicin,fidaxomicin,lipiarmicin,lipiarmycin,lipiarrmycin,tiacumicin b"	0.4	"g"			"73599-3,73621-5,73644-7"
+"FIN"	11567473	"Finafloxacin"	"Quinolones"	"NA"			""	"finafloxacin"					"73598-5,73620-7,73643-9"
 "FLA"	46783781	"Flavomycin"	"Other antibacterials"	"NA"			""	"flavophospholipol,moenomycin complex"					""
-"FLE"	3357	"Fleroxacin"	"Quinolones"	"J01MA08"	"Quinolone antibacterials"	"Fluoroquinolones"	"fler"	"fleroxacin,fleroxacine,fleroxacino,fleroxacinum,fleroxicin,megalocin,megalone,megalosin,quinodis"	0.4	"g"	0.4	"g"	""
-"FLO"	65864	"Flomoxef"	"Other antibacterials"	"J01DC14"			""	"flomoxef,flomoxefo,flomoxefum"			2	"g"	""
-"FLR"	114811	"Florfenicol"	"Other antibacterials"	"NA"			""	"aquafen,florfenicol,nuflor,nuflor gold"					"87599-7"
+"FLE"	3357	"Fleroxacin"	"Quinolones"	"J01MA08"	"Quinolone antibacterials"	"Fluoroquinolones"	"fler"	"fleroxacin,fleroxacine,fleroxacino,fleroxacinum,fleroxicin,megalocin,megalone,megalosin,quinodis"	0.4	"g"	0.4	"g"	"25411-0,32372-5,35806-9,7012-8"
+"FLO"	65864	"Flomoxef"	"Other antibacterials"	"J01DC14"			""	"flomoxef,flomoxefo,flomoxefum"			2	"g"	"100052-0,53822-3"
+"FLR"	114811	"Florfenicol"	"Other antibacterials"	"NA"			""	"aquafen,florfenicol,nuflor,nuflor gold"					"23740-4,35807-7,35808-5,87599-7"
 "FLC"	21319	"Flucloxacillin"	"Beta-lactams/penicillins"	"J01CF05"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"clox,flux"	"culpen,floxacillin,floxacillin sodium,floxapen,floxapen sodium salt,fluclox,flucloxacilina,flucloxacillin,flucloxacilline,flucloxacillinum,fluorochloroxacillin,staphylex"	2	"g"	2	"g"	""
-"FLU"	3365	"Fluconazole"	"Antifungals/antimycotics"	"D01AC15,J02AC01"	"Antimycotics for systemic use"	"Triazole derivatives"	"fluc,fluz,flz"	"alflucoz,alfumet,alkanazole,biocanol,biozole,biozolene,canzol,cryptal,diflazon,diflucan,dimycon,elazor,flucazol,fluconazol,fluconazole,fluconazole capsules,fluconazoli,fluconazolum,flucoral,flucostat,flukezol,flunazol,flunizol,flusol,fluzon,fluzone,forcan,fuconal,fungata,loitin,oxifugol,pritenzol,syscan,trican,triconal,triflucan,zoltec"	0.2	"g"	0.2	"g"	"10987-6,16870-8,25255-1,80530-9"
+"FLU"	3365	"Fluconazole"	"Antifungals/antimycotics"	"D01AC15,J02AC01"	"Antimycotics for systemic use"	"Triazole derivatives"	"fluc,fluz,flz"	"alflucoz,alfumet,alkanazole,biocanol,biozole,biozolene,canzol,cryptal,diflazon,diflucan,dimycon,elazor,flucazol,fluconazol,fluconazole,fluconazole capsules,fluconazoli,fluconazolum,flucoral,flucostat,flukezol,flunazol,flunizol,flusol,fluzon,fluzone,forcan,fuconal,fungata,loitin,oxifugol,pritenzol,syscan,trican,triconal,triflucan,zoltec"	0.2	"g"	0.2	"g"	"10987-6,16870-8,18924-1,248-5,249-3,250-1,251-9,25255-1,7013-6,80530-9"
 "FCT"	3366	"Flucytosine"	"Antifungals/antimycotics"	"D01AE21,J02AX01"	"Antifungals for topical use"	"Other antifungals for topical use"	"5flc,fcu,fluo,fluy"	"alcobon,ancoban,ancobon,ancotil,ancotyl,flourocytosine,flucitosina,flucystine,flucytosin,flucytosine,flucytosinum,flucytosone,fluocytosine,fluorcytosine,fluorocytosine"					""
-"FLM"	3374	"Flumequine"	"Quinolones"	"J01MB07"	"Quinolone antibacterials"	"Other quinolones"	""	"apurone,fantacin,flumequine,flumequino,flumequinum,flumigal,flumiquil,flumisol,flumix,imequyl"	1.2	"g"			""
+"FLM"	3374	"Flumequine"	"Quinolones"	"J01MB07"	"Quinolone antibacterials"	"Other quinolones"	""	"apurone,fantacin,flumequine,flumequino,flumequinum,flumigal,flumiquil,flumisol,flumix,imequyl"	1.2	"g"			"55675-3,55676-1,55677-9,55678-7"
 "FLR1"	71260	"Flurithromycin"	"Macrolides/lincosamides"	"J01FA14"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"flurithromicina,flurithromycime,flurithromycin,flurithromycine,flurithromycinum,fluritromicina,fluritromycinum,flurizic"	0.75	"g"			""
 "FFL"	214356	"Fosfluconazole"	"Antifungals/antimycotics"	"NA"			""	"fosfluconazole,phosfluconazole,procif,prodif"					""
-"FOS"	446987	"Fosfomycin"	"Other antibacterials"	"J01XX01"	"Other antibacterials"	"Other antibacterials"	"ff,fm,fo,fof,fos,fosf"	"calcium fosfomycin,fosfocina,fosfomicin,fosfomicina,fosfomycin,fosfomycin sodium,fosfomycine,fosfomycinum,fosfonomycin,infectophos,monuril,monurol,phosphonemycin,phosphonomycin,veramina"	3	"g"	8	"g"	""
+"FOS"	446987	"Fosfomycin"	"Other antibacterials"	"J01XX01"	"Other antibacterials"	"Other antibacterials"	"ff,fm,fo,fof,fos,fosf"	"calcium fosfomycin,fosfocina,fosfomicin,fosfomicina,fosfomycin,fosfomycin sodium,fosfomycine,fosfomycinum,fosfonomycin,infectophos,monuril,monurol,phosphonemycin,phosphonomycin,veramina"	3	"g"	8	"g"	"25596-8,25653-7,35809-3,35810-1"
 "FMD"	572	"Fosmidomycin"	"Other antibacterials"	"NA"			""	"fosmidomycin,fosmidomycina,fosmidomycine,fosmidomycinum"					""
-"FRM"	8378	"Framycetin"	"Aminoglycosides"	"D09AA01,R01AX08,S01AA07"			"fram"	"actilin,actiline,antibiotique,bycomycin,dekamycin iii,endomixin,enterfram,fradiomycin,fradiomycin b,fradiomycinum,framicetina,framidal,framycetin,framycetin sulfate,framycetine,framycetinum,framycin,framygen,francetin,fraquinol,jernadex,myacine,myacyne,mycerin,mycifradin,neobrettin,neolate,neomas,neomcin,neomicina,neomin,neomycin,neomycin b,neomycin b sulfate,neomycin solution,neomycin sulfate,neomycin sulphate,neomycinb,neomycine,neomycinum,nivemycin,pimavecort,soframycin,soframycine,tuttomycin,vonamycin,vonamycin powder v"					""
+"FRM"	8378	"Framycetin"	"Aminoglycosides"	"D09AA01,R01AX08,S01AA07"			"fram"	"actilin,actiline,antibiotique,bycomycin,dekamycin iii,endomixin,enterfram,fradiomycin,fradiomycin b,fradiomycinum,framicetina,framidal,framycetin,framycetin sulfate,framycetine,framycetinum,framycin,framygen,francetin,fraquinol,jernadex,myacine,myacyne,mycerin,mycifradin,neobrettin,neolate,neomas,neomcin,neomicina,neomin,neomycin,neomycin b,neomycin b sulfate,neomycin solution,neomycin sulfate,neomycin sulphate,neomycinb,neomycine,neomycinum,nivemycin,pimavecort,soframycin,soframycine,tuttomycin,vonamycin,vonamycin powder v"					"18926-6,257-6,258-4,259-2,260-0,55679-5"
 "FUR"	6870646	"Furazidin"	"Other antibacterials"	"J01XE03"	"Other antibacterials"	"Nitrofuran derivatives"	""	"akritoin,furagin,furaginum,furamag,furazidin,furazidine"	0.3	"g"			""
-"FRZ"	5323714	"Furazolidone"	"Other antibacterials"	"G01AX06"			""	"bifuron,corizium,coryzium,diafuron,enterotoxon,furall,furaxon,furaxone,furazol,furazolidine,furazolidon,furazolidona,furazolidone,furazolidonum,furazolum,furazon,furidon,furovag,furox aerosol powder,furoxal,furoxane,furoxon,furoxone,furoxone liquid,furoxone swine mix,furozolidine,giardil,giarlam,medaron,neftin,nicolen,nifulidone,nifuran,nifurazolidone,nifurazolidonum,nitrofurazolidone,nitrofurazolidonum,nitrofuroxon,optazol,ortazol,puradin,roptazol,sclaventerol,tikofuran,topazone,trichofuron,tricofuron,tricoron,trifurox,viofuragyn"					""
+"FRZ"	5323714	"Furazolidone"	"Other antibacterials"	"G01AX06"			""	"bifuron,corizium,coryzium,diafuron,enterotoxon,furall,furaxon,furaxone,furazol,furazolidine,furazolidon,furazolidona,furazolidone,furazolidonum,furazolum,furazon,furidon,furovag,furox aerosol powder,furoxal,furoxane,furoxon,furoxone,furoxone liquid,furoxone swine mix,furozolidine,giardil,giarlam,medaron,neftin,nicolen,nifulidone,nifuran,nifurazolidone,nifurazolidonum,nitrofurazolidone,nitrofurazolidonum,nitrofuroxon,optazol,ortazol,puradin,roptazol,sclaventerol,tikofuran,topazone,trichofuron,tricofuron,tricoron,trifurox,viofuragyn"					"69574-2,87794-4"
 "FUS"	3000226	"Fusidic acid"	"Other antibacterials"	"D06AX01,D09AA02,J01XC01,S01AA13"	"Other antibacterials"	"Steroid antibacterials"	"fa,fusi"	"acide fusidique,acido fusidico,acidum fusidicum,flucidin,fucidate,fucidate sodium,fucidic acid,fucidin,fucidin acid,fucithalmic,fusidate,fusidate acid,fusidic acid,fusidicacid,fusidine,fusidinic acid,ramycin,taksta"	1.5	"g"	1.5	"g"	""
-"GAM"	59364992	"Gamithromycin"	"Macrolides/lincosamides"	"NA"			""	"gamithromycin"					""
-"GRN"	124093	"Garenoxacin"	"Quinolones"	"J01MA19"			""	"ganefloxacin,garenfloxacin,garenoxacin"	0.4	"g"			""
-"GAT"	5379	"Gatifloxacin"	"Quinolones"	"J01MA16,S01AE06"	"Quinolone antibacterials"	"Fluoroquinolones"	"gati"	"gatiflo,gatifloxacin,gatifloxacin hydrate,gatifloxacine,gatifloxcin,gatilox,gatiquin,gatispan,tequin,tequin and zymar,zymaxid"	0.4	"g"	0.4	"g"	""
-"GEM"	9571107	"Gemifloxacin"	"Quinolones"	"J01MA15"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"factiv,factive,gemifioxacin,gemifloxacin,gemifloxacine,gemifloxacino,gemifloxacinum"	0.32	"g"			""
-"GEN"	3467	"Gentamicin"	"Aminoglycosides"	"D06AX07,J01GB03,S01AA11,S02AA14,S03AA06"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"cn,gen,gent,gm"	"apogen,centicin,cidomycin,garamycin,garasol,genoptic liquifilm,genoptic s.o.p.,gentacycol,gentafair,gentak,gentamar,gentamcin sulfate,gentamicin,gentamicina,gentamicine,gentamicins,gentamicinum,gentamycin,gentamycins,gentamycinum,gentavet,gentocin,jenamicin,lyramycin,oksitselanim,refobacin,refobacin tm,septigen,uromycine"			0.24	"g"	"13561-6,13562-4,15106-8,22746-2,22747-0,31091-2,31092-0,31093-8,35668-3,3663-2,3664-0,3665-7,39082-3,47109-4,59379-8,80971-5,88111-0"
-"GEH"		"Gentamicin-high"	"Aminoglycosides"	"NA"			"gehi,gehl,genta high,gentamicin high"	""					""
+"GAM"	59364992	"Gamithromycin"	"Macrolides/lincosamides"	"NA"			""	"gamithromycin"					"100054-6,88376-9,88378-5"
+"GRN"	124093	"Garenoxacin"	"Quinolones"	"J01MA19"			""	"ganefloxacin,garenfloxacin,garenoxacin"	0.4	"g"			"35811-9,35812-7,35813-5"
+"GAT"	5379	"Gatifloxacin"	"Quinolones"	"J01MA16,S01AE06"	"Quinolone antibacterials"	"Fluoroquinolones"	"gati"	"gatiflo,gatifloxacin,gatifloxacin hydrate,gatifloxacine,gatifloxcin,gatilox,gatiquin,gatispan,tequin,tequin and zymar,zymaxid"	0.4	"g"	0.4	"g"	"31036-7,31038-3,31040-9,31042-5,41494-6"
+"GEM"	9571107	"Gemifloxacin"	"Quinolones"	"J01MA15"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"factiv,factive,gemifioxacin,gemifloxacin,gemifloxacine,gemifloxacino,gemifloxacinum"	0.32	"g"			"35814-3,35815-0,35816-8,41697-4"
+"GEN"	3467	"Gentamicin"	"Aminoglycosides"	"D06AX07,J01GB03,S01AA11,S02AA14,S03AA06"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"cn,gen,gent,gm"	"apogen,centicin,cidomycin,garamycin,garasol,genoptic liquifilm,genoptic s.o.p.,gentacycol,gentafair,gentak,gentamar,gentamcin sulfate,gentamicin,gentamicina,gentamicine,gentamicins,gentamicinum,gentamycin,gentamycins,gentamycinum,gentavet,gentocin,jenamicin,lyramycin,oksitselanim,refobacin,refobacin tm,septigen,uromycine"			0.24	"g"	"101494-3,13561-6,13562-4,15106-8,18928-2,18929-0,22746-2,22747-0,266-7,267-5,268-3,269-1,31091-2,31092-0,31093-8,35668-3,35817-6,3663-2,3664-0,3665-7,39082-3,47109-4,50630-3,59379-8,7016-9,7017-7,7018-5,80971-5,88111-0,89481-6"
+"GEH"		"Gentamicin-high"	"Aminoglycosides"	"NA"			"gehi,gehl,genta high,gentamicin high"	""					"18929-0,35817-6,7017-7,7018-5"
 "GEP"	25101874	"Gepotidacin"	"Other antibacterials"	"NA"			""	"gepotidacin"					""
-"GRX"	72474	"Grepafloxacin"	"Quinolones"	"J01MA11"	"Quinolone antibacterials"	"Fluoroquinolones"	"grep"	"grepafloxacin"	0.4	"g"			""
-"GRI"	441140	"Griseofulvin"	"Antifungals/antimycotics"	"D01AA08,D01BA01"			""	"amudane,curling factor,delmofulvina,fulcin,fulcine,fulvican grisactin,fulvicin,fulvicin bolus,fulvidex,fulvina,fulvinil,fulvistatin,fungivin,greosin,gresfeed,gricin,grifulin,grifulvin,grifulvin v,grisactin,grisactin ultra,grisactin v,griscofulvin,grise ostatin,grisefuline,griseo,griseoflulvin,griseofulvin,griseofulvin forte,griseofulvina,griseofulvine,griseofulvinum,griseomix,griseostatin,grisetin,grisofulvin,grisovin,grisovin fp,grizeofulvin,grysio,guservin,lamoryl,likuden,likunden,murfulvin,poncyl,spirofulvin,sporostatin xan,xuanjing"	0.5	"g"			"12402-4"
+"GRX"	72474	"Grepafloxacin"	"Quinolones"	"J01MA11"	"Quinolone antibacterials"	"Fluoroquinolones"	"grep"	"grepafloxacin"	0.4	"g"			"21316-5,23638-0,23639-8,35818-4"
+"GRI"	441140	"Griseofulvin"	"Antifungals/antimycotics"	"D01AA08,D01BA01"			""	"amudane,curling factor,delmofulvina,fulcin,fulcine,fulvican grisactin,fulvicin,fulvicin bolus,fulvidex,fulvina,fulvinil,fulvistatin,fungivin,greosin,gresfeed,gricin,grifulin,grifulvin,grifulvin v,grisactin,grisactin ultra,grisactin v,griscofulvin,grise ostatin,grisefuline,griseo,griseoflulvin,griseofulvin,griseofulvin forte,griseofulvina,griseofulvine,griseofulvinum,griseomix,griseostatin,grisetin,grisofulvin,grisovin,grisovin fp,grizeofulvin,grysio,guservin,lamoryl,likuden,likunden,murfulvin,poncyl,spirofulvin,sporostatin xan,xuanjing"	0.5	"g"			"12402-4,54200-1,54201-9,54202-7"
 "HAB"	175989	"Habekacin"	"Aminoglycosides"	"NA"			""	"arbekacin sulfate,arbekacin sulphate,habekacin,habekacin sulfate,habekacin xsulfate,habekacinxsulfate"					""
 "HCH"	11979956	"Hachimycin"	"Antifungals/antimycotics"	"D01AA03,G01AA06,J02AA02"	"Antimycotics for systemic use"	"Antibiotics"	""	"cabimicina,hachimicina,hachimycin,hachimycine,hachimycinum,trichomycinum,trichonat"					""
-"HET"	443387	"Hetacillin"	"Beta-lactams/penicillins"	"J01CA18"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"etacillina,hetacilina,hetacillin,hetacillin acid,hetacilline,hetacillinum,phenazacillin,versapen"	2	"g"			""
+"HET"	443387	"Hetacillin"	"Beta-lactams/penicillins"	"J01CA18"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"etacillina,hetacilina,hetacillin,hetacillin acid,hetacilline,hetacillinum,phenazacillin,versapen"	2	"g"			"18931-6,274-1,275-8,276-6,277-4"
 "HYG"	56928061	"Hygromycin"	"Aminoglycosides"	"NA"			""	"antihelmycin,hydromycin b,hygrovetine"					""
 "IBX"		"Ibrexafungerp"	"Antifungals"	"NA"			""	"ibrexafungerp"					""
-"ICL"	213043	"Iclaprim"	"Other antibacterials"	"J01EA03"			""	"iclaprim,mersarex"					""
-"IPM"	104838	"Imipenem"	"Carbapenems"	"J01DH51"	"Other beta-lactam antibacterials"	"Carbapenems"	"imci,imi,imip,imp"	"imipemide,imipenem,imipenem anhydrous,imipenem hydrate,imipenem/cilastatin,imipenemum,imipenen,primaxin,recarbrio .,tienamycin"			2	"g"	"17010-0,25257-7,27331-8,3688-9"
-"IPE"		"Imipenem/EDTA"	"Carbapenems"	"NA"			""	""					""
-"IMR"		"Imipenem/relebactam"	"Carbapenems"	"NA,J01DH56"			""	""					""
-"ISV"	6918485	"Isavuconazole"	"Antifungals/antimycotics"	"J02AC05"			"isav"	"isavuconazole"	0.2	"g"	0.2	"g"	""
-"ISE"	3037209	"Isepamicin"	"Aminoglycosides"	"J01GB11"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	""	"isepacin,isepalline,isepamicin,isepamicina,isepamicine,isepamicinsulphate,isepamicinum"			0.4	"g"	""
-"ISO"	3760	"Isoconazole"	"Antifungals/antimycotics"	"D01AC05,G01AF07"	"Antimycotics for topic use"	"Triazole derivatives"	""	"isoconazol,isoconazole,isoconazolum,travogen"					""
-"INH"	3767	"Isoniazid"	"Antimycobacterials"	"J04AC01"	"Drugs for treatment of tuberculosis"	"Hydrazides"	"inh"	"abdizide,andrazide,anidrasona,antimicina,antituberkulosum,armacide,armazid,armazide,atcotibine,azt + isoniazid,azuren,bacillin,cemidon,chemiazid,chemidon,continazine,cortinazine,cotinazin,cotinizin,defonin,dianicotyl,dibutin,diforin,dinacrin,ditubin,ebidene,eralon,ertuban,eutizon,evalon,fetefu,fimalene,hid rasonil,hidranizil,hidrasonil,hidrulta,hidrun,hycozid,hydrazid,hydrazide,hyozid,i.a.i.,idrazil,inizid,ipcazide,iscotin,isidrina,ismazide,isobicina,isocid,isocidene,isocotin,isohydrazide,isokin,isolyn,isonerit,isonex,isoniacid,isoniazid,isoniazid sa,isoniazida,isoniazide,isoniazidum,isonicazide,isonicid,isonico,isonicotan,isonicotil,isonicotinhydrazid,isonicotinohydrazide,isonide,isonidrin,isonikazid,isonilex,isonin,isonindon,isonirit,isoniton,isonizida,isonizide,isotamine,isotebe,isotebezid,isotinyl,isozid,isozide,isozyd,laniazid,laniozid,lanizid,mayambutol,mybasan,neoteben,neoxin,neumandin,niadrin,nicazide,nicetal,nicizina,niconyl,nicotibina,nicotibine,nicotisan,nicozide,nidaton,nidrazid,nikozid,niplen,nitadon,niteban,nydrazid,nyscozid,pelazid,percin,phthisen,pycazide,pyreazid,pyricidin,pyridicin,pyrizidin,raumanon,razide,retozide,rifater,rimicid,rimifon,rimiphone,rimitsid,robiselin,robisellin,roxifen,sanohidrazina,sauterazid,sauterzid,stanozide,tebecid,tebenic,tebexin,tebilon,teebaconin,tekazin,tibazide,tibemid,tibiazide,tibinide,tibison,tibivis,tibizide,tibusan,tisiodrazida,tizide,tubazid,tubazide,tubeco,tubecotubercid,tuberian,tubicon,tubilysin,tubizid,tubomel,unicocyde,unicozyde,vazadrine,vederon,zidafimia,zinadon,zonazide"	0.3	"g"	0.3	"g"	"25451-6,26756-7,3697-0,40371-7"
+"ICL"	213043	"Iclaprim"	"Other antibacterials"	"J01EA03"			""	"iclaprim,mersarex"					"73597-7,73619-9,73642-1"
+"IPM"	104838	"Imipenem"	"Carbapenems"	"J01DH51"	"Other beta-lactam antibacterials"	"Carbapenems"	"imci,imi,imip,imp"	"imipemide,imipenem,imipenem anhydrous,imipenem hydrate,imipenem/cilastatin,imipenemum,imipenen,primaxin,recarbrio .,tienamycin"			2	"g"	"101487-7,17010-0,18932-4,18933-2,23613-3,25221-3,25257-7,27331-8,278-2,279-0,280-8,281-6,282-4,283-2,284-0,285-7,35819-2,3688-9,54170-6,54171-4,54172-2,7019-3,85424-0,93232-7,96372-8"
+"IPE"		"Imipenem/EDTA"	"Carbapenems"	"NA"			""	""					"35819-2,54170-6,54171-4,54172-2"
+"IMR"		"Imipenem/relebactam"	"Carbapenems"	"NA,J01DH56"			""	""					"85424-0,93232-7,96372-8"
+"ISV"	6918485	"Isavuconazole"	"Antifungals/antimycotics"	"J02AC05"			"isav"	"isavuconazole"	0.2	"g"	0.2	"g"	"85381-2,88887-5"
+"ISE"	3037209	"Isepamicin"	"Aminoglycosides"	"J01GB11"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	""	"isepacin,isepalline,isepamicin,isepamicina,isepamicine,isepamicinsulphate,isepamicinum"			0.4	"g"	"32381-6,35820-0,35821-8,55680-3"
+"ISO"	3760	"Isoconazole"	"Antifungals/antimycotics"	"D01AC05,G01AF07"	"Antimycotics for topic use"	"Triazole derivatives"	""	"isoconazol,isoconazole,isoconazolum,travogen"					"55681-1,55682-9,55683-7,55684-5"
+"INH"	3767	"Isoniazid"	"Antimycobacterials"	"J04AC01"	"Drugs for treatment of tuberculosis"	"Hydrazides"	"inh"	"abdizide,andrazide,anidrasona,antimicina,antituberkulosum,armacide,armazid,armazide,atcotibine,azt + isoniazid,azuren,bacillin,cemidon,chemiazid,chemidon,continazine,cortinazine,cotinazin,cotinizin,defonin,dianicotyl,dibutin,diforin,dinacrin,ditubin,ebidene,eralon,ertuban,eutizon,evalon,fetefu,fimalene,hid rasonil,hidranizil,hidrasonil,hidrulta,hidrun,hycozid,hydrazid,hydrazide,hyozid,i.a.i.,idrazil,inizid,ipcazide,iscotin,isidrina,ismazide,isobicina,isocid,isocidene,isocotin,isohydrazide,isokin,isolyn,isonerit,isonex,isoniacid,isoniazid,isoniazid sa,isoniazida,isoniazide,isoniazidum,isonicazide,isonicid,isonico,isonicotan,isonicotil,isonicotinhydrazid,isonicotinohydrazide,isonide,isonidrin,isonikazid,isonilex,isonin,isonindon,isonirit,isoniton,isonizida,isonizide,isotamine,isotebe,isotebezid,isotinyl,isozid,isozide,isozyd,laniazid,laniozid,lanizid,mayambutol,mybasan,neoteben,neoxin,neumandin,niadrin,nicazide,nicetal,nicizina,niconyl,nicotibina,nicotibine,nicotisan,nicozide,nidaton,nidrazid,nikozid,niplen,nitadon,niteban,nydrazid,nyscozid,pelazid,percin,phthisen,pycazide,pyreazid,pyricidin,pyridicin,pyrizidin,raumanon,razide,retozide,rifater,rimicid,rimifon,rimiphone,rimitsid,robiselin,robisellin,roxifen,sanohidrazina,sauterazid,sauterzid,stanozide,tebecid,tebenic,tebexin,tebilon,teebaconin,tekazin,tibazide,tibemid,tibiazide,tibinide,tibison,tibivis,tibizide,tibusan,tisiodrazida,tizide,tubazid,tubazide,tubeco,tubecotubercid,tuberian,tubicon,tubilysin,tubizid,tubomel,unicocyde,unicozyde,vazadrine,vederon,zidafimia,zinadon,zonazide"	0.3	"g"	0.3	"g"	"18934-0,20383-6,23947-5,25217-1,25218-9,25219-7,25451-6,26756-7,286-5,287-3,288-1,289-9,29315-9,3697-0,40371-7,42649-4,42650-2,42651-0,45215-1,48171-3,48172-1,55685-2,7020-1,89488-1"
 "IST"		"Isoniazid/sulfamethoxazole/trimethoprim/pyridoxine"	"Antimycobacterials"	"J04AM08"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
-"ITR"	3793	"Itraconazole"	"Antifungals/antimycotics"	"J02AC02"	"Antimycotics for systemic use"	"Triazole derivatives"	"itra"	"intraconazole,itraconazol,itraconazole,itraconazolo,itraconazolum,itraconzaole,itrazole,itrizole,oriconazole,sporanox"	0.2	"g"	0.2	"g"	"10989-2,12392-7,25258-5,27081-9,32184-4,32185-1,80531-7"
-"JOS"	5282165	"Josamycin"	"Macrolides/lincosamides"	"J01FA07"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"jomybel,josacine,josamicina,josamycin,josamycine,josamycinum"	2	"g"			""
-"KAN"	6032	"Kanamycin"	"Aminoglycosides"	"A07AA08,J01GB04,S01AA24"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"hlk,k,kan,kana,km"	"kanamicina,kanamycin,kanamycin a,kanamycin base,kanamycin sulfate,kanamycina,kanamycine,kanamycins,kanamycinum,kantrex,kenamycin a,klebcil,liposomal kanamycin"	3	"g"	1	"g"	"23889-9,3698-8,3699-6,3700-2,47395-9"
-"KAH"		"Kanamycin-high"	"Aminoglycosides"	"NA"			"k_h,kahl"	""					""
+"ITR"	3793	"Itraconazole"	"Antifungals/antimycotics"	"J02AC02"	"Antimycotics for systemic use"	"Triazole derivatives"	"itra"	"intraconazole,itraconazol,itraconazole,itraconazolo,itraconazolum,itraconzaole,itrazole,itrizole,oriconazole,sporanox"	0.2	"g"	0.2	"g"	"10989-2,12392-7,25258-5,25452-4,27081-9,32184-4,32185-1,32603-3,54179-7,7021-9,80531-7"
+"JOS"	5282165	"Josamycin"	"Macrolides/lincosamides"	"J01FA07"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"jomybel,josacine,josamicina,josamycin,josamycine,josamycinum"	2	"g"			"25597-6,25702-2,41698-2,41699-0"
+"KAN"	6032	"Kanamycin"	"Aminoglycosides"	"A07AA08,J01GB04,S01AA24"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"hlk,k,kan,kana,km"	"kanamicina,kanamycin,kanamycin a,kanamycin base,kanamycin sulfate,kanamycina,kanamycine,kanamycins,kanamycinum,kantrex,kenamycin a,klebcil,liposomal kanamycin"	3	"g"	1	"g"	"18935-7,18936-5,23609-1,23889-9,25182-7,25213-0,25214-8,290-7,291-5,292-3,293-1,3698-8,3699-6,3700-2,42652-8,47395-9,49080-5,7022-7,7023-5,7024-3,88002-1,88705-9,89482-4"
+"KAH"		"Kanamycin-high"	"Aminoglycosides"	"NA"			"k_h,kahl"	""					"18936-5,7023-5,7024-3"
 "KAC"		"Kanamycin/cephalexin"	"Aminoglycosides"	"NA"			""	""					""
-"KET"	456201	"Ketoconazole"	"Antifungals/antimycotics"	"D01AC08,G01AF11,H02CA03,J02AB02"	"Antimycotics for systemic use"	"Imidazole derivatives"	"keto,ktc"	"extina,fungarest,fungoral,ketocanazole,ketoconazol,ketoconazole,ketoconazolum,ketoderm,nizoral,xolegel"	0.6	"g"			"10990-0,12393-5,25259-3,60091-6,60092-4"
+"KET"	456201	"Ketoconazole"	"Antifungals/antimycotics"	"D01AC08,G01AF11,H02CA03,J02AB02"	"Antimycotics for systemic use"	"Imidazole derivatives"	"keto,ktc"	"extina,fungarest,fungoral,ketocanazole,ketoconazol,ketoconazole,ketoconazolum,ketoderm,nizoral,xolegel"	0.6	"g"			"10990-0,12393-5,18937-3,25259-3,294-9,295-6,296-4,297-2,60091-6,60092-4,7025-0"
 "KIT"		"Kitasamycin"	"Macrolides/lincosamides"	"NA"			"leucomycin"	"jomybel,josacine,josamicina,josamycin,josamycine,josamycinum"					""
 "LAS"	5360807	"Lasalocid"	"Other antibacterials"	"NA"			""	"avatec,lasalocid,lasalocid a,lasalocide,lasalocide a,lasalocido,lasalocidum"					"87598-9"
 "LSC"	71528768	"Lascufloxacin"	"Quinolones"	"J01MA25"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"lascufloxacin"	75	"mg"			""
 "LTM"	47499	"Latamoxef"	"Cephalosporins (3rd gen.)"	"J01DD06"	"Other beta-lactam antibacterials"	"Third-generation cephalosporins"	"mox,moxa,moxalactam"	"disodium moxalactam,festamoxin,lamoxactam,latamoxef,latamoxefum,moxalactamsupplement,shiomarin"			4	"g"	""
-"LMU"	25185057	"Lefamulin"	"Other antibacterials"	"J01XX12"			""	"lefamulin,xenleta"					""
+"LMU"	25185057	"Lefamulin"	"Other antibacterials"	"J01XX12"			""	"lefamulin,xenleta"					"85425-7,99281-8"
 "LEN"	65646	"Lenampicillin"	"Beta-lactams/penicillins"	"NA"			""	"lenampicilina,lenampicillin,lenampicillin hcl,lenampicilline,lenampicillinum"					""
-"LVX"	149096	"Levofloxacin"	"Quinolones"	"J01MA12,S01AE05"	"Quinolone antibacterials"	"Fluoroquinolones"	"le,lev,levo,lvx"	"aeroquin,anhydrous ofloxacin,cravit,cravit hydrate,cravit iv,cravit ophthalmic,elequine,floxacin,floxel,fluoroquinolone,iquix hydrate,leroxacin,lesacin,levaquin,levaquin hydrate,levo floxacin,levofiexacin,levofloxacin,levofloxacin hydrate,levofloxacine,levofloxacino,levofloxacinum,levokacin,levoxacin,mosardal,nofaxin,ofloxcacin,oftaquix,quinsair,quixin,reskuin,tavanic,unibiotic,venaxan,volequin"	0.5	"g"	0.5	"g"	"21368-6,30532-6,30533-4"
+"LVX"	149096	"Levofloxacin"	"Quinolones"	"J01MA12,S01AE05"	"Quinolone antibacterials"	"Fluoroquinolones"	"le,lev,levo,lvx"	"aeroquin,anhydrous ofloxacin,cravit,cravit hydrate,cravit iv,cravit ophthalmic,elequine,floxacin,floxel,fluoroquinolone,iquix hydrate,leroxacin,lesacin,levaquin,levaquin hydrate,levo floxacin,levofiexacin,levofloxacin,levofloxacin hydrate,levofloxacine,levofloxacino,levofloxacinum,levokacin,levoxacin,mosardal,nofaxin,ofloxcacin,oftaquix,quinsair,quixin,reskuin,tavanic,unibiotic,venaxan,volequin"	0.5	"g"	0.5	"g"	"101501-5,20396-8,20629-2,21367-8,21368-6,30532-6,30533-4,48173-9,53716-7,7026-8,76040-5,76041-3,76042-1"
 "LEO"		"Levofloxacin/ornidazole"	"Other antibacterials"	"J01RA05"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "LND"	9850038	"Levonadifloxacin"	"Quinolones"	"J01MA24"			""	"levonadifloxacin"					""
 "LSP"		"Linco-spectin"	"Other antibacterials"	"NA"			"lincomycin/spectinomycin"	""					""
-"LIN"	3000540	"Lincomycin"	"Macrolides/lincosamides"	"J01FF02"	"Macrolides, lincosamides and streptogramins"	"Lincosamides"	"linc"	"bactramycin,cillimycin,frademicina,jiemycin,lincocin,lincolcina,lincolnensin,lincomicina,lincomycin,lincomycin a,lincomycine,lincomycinum,lincorex"	1.8	"g"	1.8	"g"	"87597-1"
-"LNZ"	441401	"Linezolid"	"Oxazolidinones"	"J01XX08"	"Other antibacterials"	"Other antibacterials"	"line,lnz,lz,lzd"	"linezlid,linezoid,linezolid,linezolide,linezolidum,zivoxid,zyvoxa,zyvoxam,zyvoxid"	1.2	"g"	1.2	"g"	"34202-2,80609-1"
+"LIN"	3000540	"Lincomycin"	"Macrolides/lincosamides"	"J01FF02"	"Macrolides, lincosamides and streptogramins"	"Lincosamides"	"linc"	"bactramycin,cillimycin,frademicina,jiemycin,lincocin,lincolcina,lincolnensin,lincomicina,lincomycin,lincomycin a,lincomycine,lincomycinum,lincorex"	1.8	"g"	1.8	"g"	"18938-1,298-0,299-8,300-4,301-2,41700-6,87597-1"
+"LNZ"	441401	"Linezolid"	"Oxazolidinones"	"J01XX08"	"Other antibacterials"	"Other antibacterials"	"line,lnz,lz,lzd"	"linezlid,linezoid,linezolid,linezolide,linezolidum,zivoxid,zyvoxa,zyvoxam,zyvoxid"	1.2	"g"	1.2	"g"	"29254-0,29255-7,29258-1,33332-8,34202-2,41500-0,80609-1,88706-7,96111-0"
 "LFE"		"Linoprist-flopristin"	"Other antibacterials"	"NA"			""	""					""
-"LOM"	3948	"Lomefloxacin"	"Quinolones"	"J01MA07,S01AE04"	"Quinolone antibacterials"	"Fluoroquinolones"	"lmf,lom,lome"	"lomefloxacin,lomefloxacine,lomefloxacino,lomefloxacinum,maxaquin"	0.4	"g"			""
-"LOR"	5284585	"Loracarbef"	"Cephalosporins (2nd gen.)"	"J01DC08"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"lora"	"anhydrous loracarbef,lorabid,loracabef,loracarbef,loracarbefum,lorbef,loribid"	0.6	"g"			""
-"LYM"	54707177	"Lymecycline"	"Tetracyclines"	"J01AA04"	"Tetracyclines"	"Tetracyclines"	""	"biovetin,chlortetracyclin,ciclisin,ciclolysal,ciclolysine,infaciclina,limeciclina,lisinbiotic,lymecyclin,lymecycline,lymecyclinum,mucomycin,ntetracycline,tetralisal,tetralysal,vebicyclysal"	0.6	"g"	0.6	"g"	""
+"LOM"	3948	"Lomefloxacin"	"Quinolones"	"J01MA07,S01AE04"	"Quinolone antibacterials"	"Fluoroquinolones"	"lmf,lom,lome"	"lomefloxacin,lomefloxacine,lomefloxacino,lomefloxacinum,maxaquin"	0.4	"g"			"18939-9,302-0,303-8,304-6,305-3,41701-4"
+"LOR"	5284585	"Loracarbef"	"Cephalosporins (2nd gen.)"	"J01DC08"	"Other beta-lactam antibacterials"	"Second-generation cephalosporins"	"lora"	"anhydrous loracarbef,lorabid,loracabef,loracarbef,loracarbefum,lorbef,loribid"	0.6	"g"			"18940-7,306-1,307-9,308-7,309-5,7027-6"
+"LYM"	54707177	"Lymecycline"	"Tetracyclines"	"J01AA04"	"Tetracyclines"	"Tetracyclines"	""	"biovetin,chlortetracyclin,ciclisin,ciclolysal,ciclolysine,infaciclina,limeciclina,lisinbiotic,lymecyclin,lymecycline,lymecyclinum,mucomycin,ntetracycline,tetralisal,tetralysal,vebicyclysal"	0.6	"g"	0.6	"g"	"18941-5,310-3,311-1,312-9,313-7"
 "MNA"	1292	"Mandelic acid"	"Other antibacterials"	"B05CA06,J01XX06"	"Other antibacterials"	"Other antibacterials"	""	"acido mandelico,almond acid,ammonium mandelate,amygdalic acid,benzoglycolic acid,hydroxyacetic acid,kyselina mandlova,mandelic acid,paramandelic acid,phenylglycolic acid,uromaline"	12	"g"			""
 "MGX"		"Manogepix"	"Antifungals"	"NA"			""	"manogepix"					""
-"MAR"	60651	"Marbofloxacin"	"Quinolones"	"NA"			""	"marbocyl,marbofloxacin,marbofloxacine,marbofloxacino,marbofloxacinum,zeniquin"					""
+"MAR"	60651	"Marbofloxacin"	"Quinolones"	"NA"			""	"marbocyl,marbofloxacin,marbofloxacine,marbofloxacino,marbofloxacinum,zeniquin"					"73596-9,73618-1,73641-3"
 "MEC"	36273	"Mecillinam"	"Beta-lactams/penicillins"	"J01CA11"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"amdinocillin"	"amdinocillin,coactin,hexacillin,mecilinamo,mecillinam,mecillinamum,micillinam,penicillin hx,selexidin"			1.2	"g"	""
 "MEL"	71306732	"Meleumycin"	"Macrolides/lincosamides"	"NA"			""	""					""
-"MEM"	441130	"Meropenem"	"Carbapenems"	"J01DH02"	"Other beta-lactam antibacterials"	"Carbapenems"	"mem,mer,mero,mp,mrp"	"meronem,meropen,meropenem,meropenem anhydrous,meropenem hydrate,meropenem trihydrate,meropenemum,merrem,merrem i.v.,merrem iv"			3	"g"	"41406-0"
+"MEM"	441130	"Meropenem"	"Carbapenems"	"J01DH02"	"Other beta-lactam antibacterials"	"Carbapenems"	"mem,mer,mero,mp,mrp"	"meronem,meropen,meropenem,meropenem anhydrous,meropenem hydrate,meropenem trihydrate,meropenemum,merrem,merrem i.v.,merrem iv"			3	"g"	"101222-8,101488-5,101489-3,18943-1,41406-0,6651-4,6652-2,6653-0,6654-8,7029-2,85426-5,85427-3,88892-5,90980-4"
 "MNC"		"Meropenem/nacubactam"	"Carbapenems"	"NA"			""	""					""
-"MEV"		"Meropenem/vaborbactam"	"Carbapenems"	"J01DH52"	"Other beta-lactam antibacterials"	"Carbapenems"	""	"carbavance,vabomere"			3	"g"	""
+"MEV"		"Meropenem/vaborbactam"	"Carbapenems"	"J01DH52"	"Other beta-lactam antibacterials"	"Carbapenems"	""	"carbavance,vabomere"			3	"g"	"101222-8,101489-3,85427-3,88892-5,90980-4"
 "MES"	176886	"Mesulfamide"	"Other antibacterials"	"NA"			""	"mesulfamide,mesulfamido,mesulfamidum"					""
 "MTC"	54675785	"Metacycline"	"Tetracyclines"	"J01AA05"	"Tetracyclines"	"Tetracyclines"	""	"bialatan,metaciclina,metacycline,metacyclinum,methacycline,methacycline base,methacyclinum,methylenecycline,physiomycine,rondomycin"	0.6	"g"			""
 "MTM"	6713928	"Metampicillin"	"Beta-lactams/penicillins"	"J01CA14"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"blomopen,bonopen,celinmicina,elatocilline,fedacilina kapseln,filorex,italcina kapseln,magnipen,metabacter ampullen,metambac,metampicilina,metampicillin,metampicillin sodium,metampicillina,metampicilline,metampicillinum,methampicillin,metiskia ampullen,micinovo,micinovo ampullen,pangocilin,probiotic,rastomycin k,relyothenate,ruticina,rutizina,rutizina ampullen,sedomycin,suvipen,suvipen ampullen,tampilen ampullen,teonicon trofen,viderpen,viderpin,vioplex"	1.5	"g"	1.5	"g"	""
@ -260,63 +260,63 @@
 "MET"	6087	"Meticillin"	"Beta-lactams/penicillins"	"J01CF03"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"meti"	"dimocillin,metacillin,methcilline,methicillin,methicillinum,methycillin,meticilina,meticillin,meticillina,meticilline,meticillinum,staphcillin"			4	"g"	""
 "MTP"	68590	"Metioprim"	"Other antibacterials"	"NA"			""	"methioprim,metioprim,metioprima,metioprime,metioprimum"					""
 "MXT"	3047729	"Metioxate"	"Quinolones"	"NA"			""	"metioxate,metioxato,metioxatum"					""
-"MTR"	4173	"Metronidazole"	"Other antibacterials"	"A01AB17,D06BX01,G01AF01,J01XD01,P01AB01"	"Other antibacterials"	"Imidazole derivatives"	"metr,mnz"	"acromona,anagiardil,arilin,atrivyl,danizol,deflamon,donnan,efloran,elyzol,entizol,flagemona,flagesol,flagil,flagyl,flagyl er,flagyl i.v.,flagyl i.v. rtu,flazol,flegyl,florazole,fossyol,giatricol,ginefla vir,gineflavir,helidac,mepagyl,meronidal,methronidazole,metric,metro cream,metro gel,metro i.v,metro i.v.,metro iv,metrocream,metrodzhil,metrogel,metrogyl,metrolag,metrolotion,metrolyl,metromidol,metronidaz,metronidazol,metronidazole,metronidazole usp,metronidazolo,metronidazolum,metrotop,metrozine,metryl,mexibol,mexibol 'silanes',monagyl,monasin,nidagel,nidagyl,noritate,novonidazol,nuvessa,orvagil,polibiotic,protostat,rathimed,rosased,sanatrichom,satric,takimetol,trichazol,trichex,tricho cordes,trichobrol,trichocide,trichomol,trichopal,trichopol,tricocet,tricom,tricowas b,trikacide,trikamon,trikhopol,trikojol,trikozol,trimeks,trivazol,vagilen,vagimid,vandazole,vertisal,wagitran,zadstat,zidoval"	2	"g"	1.5	"g"	"10991-8"
-"MEZ"	656511	"Mezlocillin"	"Beta-lactams/penicillins"	"J01CA10"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"mez,mezl,mz"	"mezlin,mezlocilina,mezlocillin,mezlocillin acid,mezlocillin sodium,mezlocilline,mezlocillinum,multocillin"			6	"g"	"3820-8"
-"MSU"		"Mezlocillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
-"MIF"	477468	"Micafungin"	"Antifungals/antimycotics"	"J02AX05"	"Antimycotics for systemic use"	"Other antimycotics for systemic use"	"mica"	"micafungin,mycamine"			0.1	"g"	"58418-5"
-"MCZ"	4189	"Miconazole"	"Antifungals/antimycotics"	"A01AB09,A07AC01,D01AC02,G01AF04,J02AB01,S02AA13"	"Antimycotics for systemic use"	"Imidazole derivatives"	"mico"	"aflorix,albistat,andergin,brentan,conofite,dactarin,daktarin,daktarin iv,florid,lotrimin af,micantin,miconasil nitrate,miconazol,miconazole,miconazole base,miconazolo,miconazolum,micozole,minostate,monista,monistat,monistat iv,oravig,vusion,zimybase,zimycan"	0.2	"g"	1	"g"	"17278-3"
+"MTR"	4173	"Metronidazole"	"Other antibacterials"	"A01AB17,D06BX01,G01AF01,J01XD01,P01AB01"	"Other antibacterials"	"Imidazole derivatives"	"metr,mnz"	"acromona,anagiardil,arilin,atrivyl,danizol,deflamon,donnan,efloran,elyzol,entizol,flagemona,flagesol,flagil,flagyl,flagyl er,flagyl i.v.,flagyl i.v. rtu,flazol,flegyl,florazole,fossyol,giatricol,ginefla vir,gineflavir,helidac,mepagyl,meronidal,methronidazole,metric,metro cream,metro gel,metro i.v,metro i.v.,metro iv,metrocream,metrodzhil,metrogel,metrogyl,metrolag,metrolotion,metrolyl,metromidol,metronidaz,metronidazol,metronidazole,metronidazole usp,metronidazolo,metronidazolum,metrotop,metrozine,metryl,mexibol,mexibol 'silanes',monagyl,monasin,nidagel,nidagyl,noritate,novonidazol,nuvessa,orvagil,polibiotic,protostat,rathimed,rosased,sanatrichom,satric,takimetol,trichazol,trichex,tricho cordes,trichobrol,trichocide,trichomol,trichopal,trichopol,tricocet,tricom,tricowas b,trikacide,trikamon,trikhopol,trikojol,trikozol,trimeks,trivazol,vagilen,vagimid,vandazole,vertisal,wagitran,zadstat,zidoval"	2	"g"	1.5	"g"	"10991-8,18946-4,326-9,327-7,328-5,329-3,7031-8"
+"MEZ"	656511	"Mezlocillin"	"Beta-lactams/penicillins"	"J01CA10"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"mez,mezl,mz"	"mezlin,mezlocilina,mezlocillin,mezlocillin acid,mezlocillin sodium,mezlocilline,mezlocillinum,multocillin"			6	"g"	"18947-2,330-1,331-9,332-7,333-5,3820-8,41702-2,54194-6,54195-3,54196-1"
+"MSU"		"Mezlocillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					"54194-6,54195-3,54196-1"
+"MIF"	477468	"Micafungin"	"Antifungals/antimycotics"	"J02AX05"	"Antimycotics for systemic use"	"Other antimycotics for systemic use"	"mica"	"micafungin,mycamine"			0.1	"g"	"53812-4,58418-5,65340-2,85048-7"
+"MCZ"	4189	"Miconazole"	"Antifungals/antimycotics"	"A01AB09,A07AC01,D01AC02,G01AF04,J02AB01,S02AA13"	"Antimycotics for systemic use"	"Imidazole derivatives"	"mico"	"aflorix,albistat,andergin,brentan,conofite,dactarin,daktarin,daktarin iv,florid,lotrimin af,micantin,miconasil nitrate,miconazol,miconazole,miconazole base,miconazolo,miconazolum,micozole,minostate,monista,monistat,monistat iv,oravig,vusion,zimybase,zimycan"	0.2	"g"	1	"g"	"17278-3,25607-3,25722-0,54180-5,55686-0"
 "MCR"	3037206	"Micronomicin"	"Aminoglycosides"	"S01AA22"			""	"gentamicin c,micromicin,micromycin,micronomicin,micronomicina,micronomicine,micronomicinum,sagamicin,santemycin"					""
 "MID"	5282169	"Midecamycin"	"Macrolides/lincosamides"	"J01FA03"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"aboren,espinomycin a,macropen,madecacine,medemycin,midecamicina,midecamycin,midecamycin a,midecamycine,midecamycinum,midecin,momicine,mydecamycin,myoxam,normicina,rubimycin,turimycin p"	1.2	"g"	1	"g"	""
 "MIL"	37614	"Miloxacin"	"Quinolones"	"NA"			""	"miloxacin,miloxacine,miloxacino,miloxacinum"					""
-"MNO"	54675783	"Minocycline"	"Tetracyclines"	"A01AB23,D10AF07,J01AA08"	"Tetracyclines"	"Tetracyclines"	"mc,mh,mi,min,mino,mn,mno"	"akamin,aknemin,borymycin,dynacin,klinomycin,minociclina,minocin,minocline,minocyclin,minocycline,minocyclinum,minocyn,minoderm,minomycin,sebomin,solodyn,vectrin"	1	"mg"	0.2	"g"	"34606-4,3822-4,49757-8"
-"MCM"	5282188	"Miocamycin"	"Macrolides/lincosamides"	"J01FA11"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"acecamycin,macroral,midecamycin acetate,miocamen,miocamycin,miocamycine,miokamycin,myocamicin,ponsinomycin"	1.2	"g"			""
+"MNO"	54675783	"Minocycline"	"Tetracyclines"	"A01AB23,D10AF07,J01AA08"	"Tetracyclines"	"Tetracyclines"	"mc,mh,mi,min,mino,mn,mno"	"akamin,aknemin,borymycin,dynacin,klinomycin,minociclina,minocin,minocline,minocyclin,minocycline,minocyclinum,minocyn,minoderm,minomycin,sebomin,solodyn,vectrin"	1	"mg"	0.2	"g"	"18948-0,25225-4,334-3,335-0,336-8,337-6,34606-4,3822-4,49757-8,55156-4,7032-6"
+"MCM"	5282188	"Miocamycin"	"Macrolides/lincosamides"	"J01FA11"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"acecamycin,macroral,midecamycin acetate,miocamen,miocamycin,miocamycine,miokamycin,myocamicin,ponsinomycin"	1.2	"g"			"18949-8,338-4,339-2,340-0,341-8,55687-8"
 "MON"	23667299	"Monensin sodium"	"Other antibacterials"	"NA"			""	"monensin sodium,sodium monensin"					""
 "MRN"	70374	"Morinamide"	"Antimycobacterials"	"J04AK04"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	""	"morfazinamide,morfazinammide,morfgazinamide,morinamida,morinamide,morinamide hcl,morinamidum,morphazinamid,morphazinamide,piazofolina,piazolin,piazolina"					""
-"MFX"	152946	"Moxifloxacin"	"Quinolones"	"J01MA14,S01AE07"	"Quinolone antibacterials"	"Fluoroquinolones"	"mox,moxi,mxf"	"actira,avelox,avelox i.v.,avelox iv,avolex,izilox,moxeza,moxifloxacin,moxifloxacine,moxivig,vigamox,zimoxin"	0.4	"g"	0.4	"g"	"43751-7,45223-5,80540-8"
-"MUP"	446596	"Mupirocin"	"Other antibacterials"	"D06AX09,R01AX06"			"mup,mupi"	"bactoderm,bactroban,bactroban nasal,bactroban ointment,centany,mupirocin,mupirocina,mupirocine,mupirocinum,plasimine,pseudomonic acid,pseudomonic acid a,turixin"					""
+"MFX"	152946	"Moxifloxacin"	"Quinolones"	"J01MA14,S01AE07"	"Quinolone antibacterials"	"Fluoroquinolones"	"mox,moxi,mxf"	"actira,avelox,avelox i.v.,avelox iv,avolex,izilox,moxeza,moxifloxacin,moxifloxacine,moxivig,vigamox,zimoxin"	0.4	"g"	0.4	"g"	"31037-5,31039-1,31041-7,31043-3,41502-6,43751-7,45223-5,76043-9,76044-7,76045-4,80540-8,88707-5,93497-6,96112-8"
+"MUP"	446596	"Mupirocin"	"Other antibacterials"	"D06AX09,R01AX06"			"mup,mupi"	"bactoderm,bactroban,bactroban nasal,bactroban ointment,centany,mupirocin,mupirocina,mupirocine,mupirocinum,plasimine,pseudomonic acid,pseudomonic acid a,turixin"					"20389-3,35822-6,35823-4,60542-8,60543-6,7033-4"
 "NAC"	73386748	"Nacubactam"	"Beta-lactams/penicillins"	"NA"			""	"nacubactam"					""
 "NAD"	4410	"Nadifloxacin"	"Quinolones"	"D10AF05"			""	"acuatim,nadifloxacin,nadifloxacine,nadifloxacino,nadifloxacinum,nadixa,nadoxin"					""
-"NAF"	8982	"Nafcillin"	"Beta-lactams/penicillins"	"J01CF06"			""	"nafcilina,nafcillin,nafcillin sodium,nafcilline,nafcillinum,nallpen,naphcillin,unipen"			3	"g"	"10993-4,25232-0"
+"NAF"	8982	"Nafcillin"	"Beta-lactams/penicillins"	"J01CF06"			""	"nafcilina,nafcillin,nafcillin sodium,nafcilline,nafcillinum,nallpen,naphcillin,unipen"			3	"g"	"10993-4,18951-4,25232-0,346-7,347-5,348-3,349-1,41704-8"
 "ZWK"	117587595	"Nafithromycin"	"Macrolides/lincosamides"	"NA"			""	"nafithromycin"					""
 "NAL"	4421	"Nalidixic acid"	"Quinolones"	"J01MB02"	"Quinolone antibacterials"	"Other quinolones"	"na,nal,nali"	"acide nalidixico,acide nalidixique,acido nalidissico,acido nalidixico,acidum nalidixicum,betaxina,dixiben,dixinal,eucisten,eucistin,innoxalomn,innoxalon,jicsron,kusnarin,naldixic acid,nalidic acid,nalidicron,nalidixan,nalidixane,nalidixate,nalidixate sodium,nalidixic,nalidixic acid,nalidixicacid,nalidixin,nalidixinic acid,nalidixinsaure,nalitucsan,nalurin,narigix,naxuril,neggram,negram,nevigramon,nicelate,nogram,poleon,sicmylon,specifen,specifin,unaserus,uralgin,uriben,uriclar,urisal,urodixin,uroman,uroneg,uronidix,uropan,wintomylon,wintron"	4	"g"			""
 "NAR"	65452	"Narasin"	"Other antibacterials"	"NA"			""	"monteban,narasin,narasin a,narasine,narasino,narasinum,narasul"					"87570-8"
 "NEM"	11993740	"Nemonoxacin"	"Quinolones"	"J01MB08"	"Quinolone antibacterials"	"Other quinolones"	""	"nemonoxacin"					""
-"NEO"	8378	"Neomycin"	"Aminoglycosides"	"A01AB08,A07AA01,B05CA09,D06AX04,J01GB05,R02AB01,S01AA03,S02AA07,S03AA01"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"neom"	"actilin,actiline,antibiotique,bycomycin,dekamycin iii,endomixin,enterfram,fradiomycin,fradiomycin b,fradiomycinum,framicetina,framidal,framycetin,framycetin sulfate,framycetine,framycetinum,framycin,framygen,francetin,fraquinol,jernadex,myacine,myacyne,mycerin,mycifradin,neobrettin,neolate,neomas,neomcin,neomicina,neomin,neomycin,neomycin b,neomycin b sulfate,neomycin solution,neomycin sulfate,neomycin sulphate,neomycinb,neomycine,neomycinum,nivemycin,pimavecort,soframycin,soframycine,tuttomycin,vonamycin,vonamycin powder v"	5	"g"			"10995-9,25262-7"
-"NET"	441306	"Netilmicin"	"Aminoglycosides"	"J01GB07,S01AA23"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"neti"	"netillin,netilmicin,netilmicin sulfate,netilmicina,netilmicine,netilmicinum,netilyn,netira,nettacin,vectacin"	0.35	"g"	0.35	"g"	"25263-5,3848-9,3849-7,3850-5,47385-0,59565-2,59566-0,59567-8"
+"NEO"	8378	"Neomycin"	"Aminoglycosides"	"A01AB08,A07AA01,B05CA09,D06AX04,J01GB05,R02AB01,S01AA03,S02AA07,S03AA01"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"neom"	"actilin,actiline,antibiotique,bycomycin,dekamycin iii,endomixin,enterfram,fradiomycin,fradiomycin b,fradiomycinum,framicetina,framidal,framycetin,framycetin sulfate,framycetine,framycetinum,framycin,framygen,francetin,fraquinol,jernadex,myacine,myacyne,mycerin,mycifradin,neobrettin,neolate,neomas,neomcin,neomicina,neomin,neomycin,neomycin b,neomycin b sulfate,neomycin solution,neomycin sulfate,neomycin sulphate,neomycinb,neomycine,neomycinum,nivemycin,pimavecort,soframycin,soframycine,tuttomycin,vonamycin,vonamycin powder v"	5	"g"			"10995-9,18953-0,25262-7,354-1,355-8,356-6,357-4,41705-5"
+"NET"	441306	"Netilmicin"	"Aminoglycosides"	"J01GB07,S01AA23"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"neti"	"netillin,netilmicin,netilmicin sulfate,netilmicina,netilmicine,netilmicinum,netilyn,netira,nettacin,vectacin"	0.35	"g"	0.35	"g"	"18954-8,25263-5,358-2,359-0,360-8,361-6,3848-9,3849-7,3850-5,47385-0,59565-2,59566-0,59567-8,7035-9"
 "NIC"	9507	"Nicarbazin"	"Other antibacterials"	"NA"			""	"nicarb,nicarbasin,nicarbazin,nicarbazine,nicoxin,nicrazin,nicrazine,nirazin"					""
 "NIF"	71946	"Nifuroquine"	"Quinolones"	"NA"			""	"abimasten,nifuroquina,nifuroquine,nifuroquinum,quinaldofur"					""
 "NFR"	9571062	"Nifurtoinol"	"Other antibacterials"	"J01XE02"	"Other antibacterials"	"Nitrofuran derivatives"	""	"levantin,nifurtoinol,nifurtoinolo,nifurtoinolum,urfadin,urfadine,urfadyn"	0.16	"g"			""
-"NTZ"	41684	"Nitazoxanide"	"Other antibacterials"	"P01AX11"			""	"adrovet,alinia,azt + nitazoxanide,colufase,cryptaz,dexidex,heliton,kidonax,nitaxozanid,nitaxozanide,nitazox,nitazoxamide,nitazoxanid,nitazoxanida,nitazoxanide,nitazoxanidum,nitrazoxanide,omniparax,pacovanton,paramix,taenitaz"	1	"g"			""
-"NIT"	6604200	"Nitrofurantoin"	"Other antibacterials"	"J01XE01"	"Other antibacterials"	"Nitrofuran derivatives"	"f,f/m,fd,ft,ni,nit,nitr"	"alfuran,benkfuran,berkfuran,berkfurin,ceduran,chemiofuran,cistofuran,cyantin,cystit,dantafur,fua med,fuamed,furabid,furachel,furadantin,furadantin retard,furadantina mc,furadantine,furadantine mc,furadantoin,furadoin,furadoine,furadonin,furadonine,furadoninum,furadontin,furadoxyl,furalan,furaloid,furantoin,furantoina,furatoin,furedan,furina,furobactina,furodantin,furophen t,gerofuran,io>>uss>>a<<ixoo,ituran,ivadantin,macpac,macrobid,macrodantin,macrodantina,macrofuran,macrofurin,nierofu,nifurantin,nifuretten,nitoin,nitrex,nitrofuradantin,nitrofurantion,nitrofurantoin,nitrofurantoin macro,nitrofurantoina,nitrofurantoine,nitrofurantoinum,novofuran,orafuran,parfuran,phenurin,piyeloseptyl,siraliden,trantoin,uerineks,urantoin,urizept,urodin,urofuran,urofurin,urolisa,urolong,uvamin,welfurin,zoofurin"	0.2	"g"			"3860-4"
-"NIZ"	5447130	"Nitrofurazone"	"Other antibacterials"	"NA"			""	"acutol,aldomycin,alfucin,amifur,babrocid,becafurazone,biofuracina,biofurea,chemofuran,chixin,cocafurin,coxistat,dermofural,dymazone,dynazone,eldezol,fedacin,flavazone,fracine,furacilin,furacilinum,furacillin,furacin,furacine,furacinetten,furacoccid,furacort,furacycline,furaderm,furagent,furalcyn,furaldon,furalone,furametral,furaplast,furaseptyl,furaskin,furatsilin,furaziline,furazin,furazina,furazol w,furazone,furazyme,furesol,furfurin,furosem,fuvacillin,hemofuran,ibiofural,mammex,mastofuran,monafuracin,monafuracis,monofuracin,nfz mix,nifucin,nifurid,nifuzon,nitrofural,nitrofuralum,nitrofuran,nitrofurane,nitrofurazan,nitrofurazone,nitrofurazonum,nitrofurol,nitrozone,otofural,otofuran,rivafurazon,sanfuran,vabrocid,vadrocid,yatrocin"					""
-"NTR"	19910	"Nitroxoline"	"Quinolones"	"J01XX07"	"Other antibacterials"	"Other antibacterials"	""	"galinok,isinok,nibiol,nicene forte,nitroxlina,nitroxolin,nitroxolina,nitroxoline,nitroxolinum,notroxoline,noxibiol"	1	"g"			""
-"NOR"	4539	"Norfloxacin"	"Quinolones"	"J01MA06,S01AE02"	"Quinolone antibacterials"	"Fluoroquinolones"	"nor,norf,nx,nxn"	"baccidal,barazan,chibroxin,chibroxine,chibroxol,fulgram,gonorcin,lexinor,nolicin,noracin,noraxin,norflo,norfloxacin,norfloxacine,norfloxacino,norfloxacinum,norocin,noroxin,noroxine,norxacin,sebercim,uroxacin,utinor,zoroxin"	0.8	"g"			"3867-9"
+"NTZ"	41684	"Nitazoxanide"	"Other antibacterials"	"P01AX11"			""	"adrovet,alinia,azt + nitazoxanide,colufase,cryptaz,dexidex,heliton,kidonax,nitaxozanid,nitaxozanide,nitazox,nitazoxamide,nitazoxanid,nitazoxanida,nitazoxanide,nitazoxanidum,nitrazoxanide,omniparax,pacovanton,paramix,taenitaz"	1	"g"			"73595-1,73617-3,73640-5"
+"NIT"	6604200	"Nitrofurantoin"	"Other antibacterials"	"J01XE01"	"Other antibacterials"	"Nitrofuran derivatives"	"f,f/m,fd,ft,ni,nit,nitr"	"alfuran,benkfuran,berkfuran,berkfurin,ceduran,chemiofuran,cistofuran,cyantin,cystit,dantafur,fua med,fuamed,furabid,furachel,furadantin,furadantin retard,furadantina mc,furadantine,furadantine mc,furadantoin,furadoin,furadoine,furadonin,furadonine,furadoninum,furadontin,furadoxyl,furalan,furaloid,furantoin,furantoina,furatoin,furedan,furina,furobactina,furodantin,furophen t,gerofuran,io>>uss>>a<<ixoo,ituran,ivadantin,macpac,macrobid,macrodantin,macrodantina,macrofuran,macrofurin,nierofu,nifurantin,nifuretten,nitoin,nitrex,nitrofuradantin,nitrofurantion,nitrofurantoin,nitrofurantoin macro,nitrofurantoina,nitrofurantoine,nitrofurantoinum,novofuran,orafuran,parfuran,phenurin,piyeloseptyl,siraliden,trantoin,uerineks,urantoin,urizept,urodin,urofuran,urofurin,urolisa,urolong,uvamin,welfurin,zoofurin"	0.2	"g"			"18955-5,362-4,363-2,364-0,365-7,3860-4,7036-7"
+"NIZ"	5447130	"Nitrofurazone"	"Other antibacterials"	"NA"			""	"acutol,aldomycin,alfucin,amifur,babrocid,becafurazone,biofuracina,biofurea,chemofuran,chixin,cocafurin,coxistat,dermofural,dymazone,dynazone,eldezol,fedacin,flavazone,fracine,furacilin,furacilinum,furacillin,furacin,furacine,furacinetten,furacoccid,furacort,furacycline,furaderm,furagent,furalcyn,furaldon,furalone,furametral,furaplast,furaseptyl,furaskin,furatsilin,furaziline,furazin,furazina,furazol w,furazone,furazyme,furesol,furfurin,furosem,fuvacillin,hemofuran,ibiofural,mammex,mastofuran,monafuracin,monafuracis,monofuracin,nfz mix,nifucin,nifurid,nifuzon,nitrofural,nitrofuralum,nitrofuran,nitrofurane,nitrofurazan,nitrofurazone,nitrofurazonum,nitrofurol,nitrozone,otofural,otofuran,rivafurazon,sanfuran,vabrocid,vadrocid,yatrocin"					"20388-5,87793-6"
+"NTR"	19910	"Nitroxoline"	"Quinolones"	"J01XX07"	"Other antibacterials"	"Other antibacterials"	""	"galinok,isinok,nibiol,nicene forte,nitroxlina,nitroxolin,nitroxolina,nitroxoline,nitroxolinum,notroxoline,noxibiol"	1	"g"			"25608-1,25723-8,32382-4,54181-3,55688-6"
+"NOR"	4539	"Norfloxacin"	"Quinolones"	"J01MA06,S01AE02"	"Quinolone antibacterials"	"Fluoroquinolones"	"nor,norf,nx,nxn"	"baccidal,barazan,chibroxin,chibroxine,chibroxol,fulgram,gonorcin,lexinor,nolicin,noracin,noraxin,norflo,norfloxacin,norfloxacine,norfloxacino,norfloxacinum,norocin,noroxin,noroxine,norxacin,sebercim,uroxacin,utinor,zoroxin"	0.8	"g"			"18956-3,366-5,367-3,368-1,369-9,3867-9,41504-2,7037-5"
 "NME"		"Norfloxacin/metronidazole"	"Other antibacterials"	"J01RA14"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "NTI"		"Norfloxacin/tinidazole"	"Other antibacterials"	"J01RA13"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "NVA"	10419027	"Norvancomycin"	"Glycopeptides"	"NA"			""	"norvancomycin"					""
-"NOV"	54675769	"Novobiocin"	"Other antibacterials"	"NA"			"novo"	"albamix,albamycin,cardelmycin,cathocin,cathomycin,crystallinic acid,inamycin,novobiocin,novobiocina,novobiocine,novobiocinum,robiocina,sirbiocina,spheromycin,stilbiocina,streptonivicin"					"17378-1"
-"NYS"	6433272	"Nystatin"	"Antifungals/antimycotics"	"A07AA02,D01AA01,G01AA01"			"nyst"	"biofanal,candex lotion,comycin,diastatin,herniocid,moronal,myconystatin,mycostatin,mycostatin pastilles,mykinac,mykostatyna,nilstat,nistatin,nistatina,nyamyc,nyotran,nyotrantrade mark,nystaform,nystan,nystatin,nystatin a,nystatin g,nystatin hydrate,nystatin lf,nystatine,nystatinum,nystatyna,nystavescent,nystex,nystop,stamycin,terrastatin,zydin e"	1.5	"MU"			""
-"OFX"	4583	"Ofloxacin"	"Quinolones"	"J01MA01,S01AE01,S02AA16"	"Quinolone antibacterials"	"Fluoroquinolones"	"of,ofl,oflo,ofx"	"bactocin,danoflox,dextrofloxacin,effexin,exocin,exocine,flobacin,flodemex,flotavid,flovid,floxal,floxil,floxin,floxin otic,floxstat,fugacin,inoflox,kinflocin,kinoxacin,levofloxacin hcl,liflox,loxinter,marfloxacin,medofloxine,mergexin,monoflocet,novecin,nufafloqo,occidal,ocuflox,oflocee,oflocet,oflocin,oflodal,oflodex,oflodura,ofloxacin,ofloxacin otic,ofloxacina,ofloxacine,ofloxacino,ofloxacinum,ofloxin,onexacin,operan,orocin,otonil,oxaldin,pharflox,praxin,puiritol,qinolon,quinolon,quotavil,sinflo,tabrin,taravid,tariflox,tarivid,telbit,tructum,uro tarivid,viotisone,visiren,zanocin"	0.4	"g"	0.4	"g"	"25264-3,3877-8"
+"NOV"	54675769	"Novobiocin"	"Other antibacterials"	"NA"			"novo"	"albamix,albamycin,cardelmycin,cathocin,cathomycin,crystallinic acid,inamycin,novobiocin,novobiocina,novobiocine,novobiocinum,robiocina,sirbiocina,spheromycin,stilbiocina,streptonivicin"					"17378-1,18957-1,370-7,371-5,372-3,373-1,41706-3"
+"NYS"	6433272	"Nystatin"	"Antifungals/antimycotics"	"A07AA02,D01AA01,G01AA01"			"nyst"	"biofanal,candex lotion,comycin,diastatin,herniocid,moronal,myconystatin,mycostatin,mycostatin pastilles,mykinac,mykostatyna,nilstat,nistatin,nistatina,nyamyc,nyotran,nyotrantrade mark,nystaform,nystan,nystatin,nystatin a,nystatin g,nystatin hydrate,nystatin lf,nystatine,nystatinum,nystatyna,nystavescent,nystex,nystop,stamycin,terrastatin,zydin e"	1.5	"MU"			"10697-1,10698-9,18958-9,35824-2,55689-4"
+"OFX"	4583	"Ofloxacin"	"Quinolones"	"J01MA01,S01AE01,S02AA16"	"Quinolone antibacterials"	"Fluoroquinolones"	"of,ofl,oflo,ofx"	"bactocin,danoflox,dextrofloxacin,effexin,exocin,exocine,flobacin,flodemex,flotavid,flovid,floxal,floxil,floxin,floxin otic,floxstat,fugacin,inoflox,kinflocin,kinoxacin,levofloxacin hcl,liflox,loxinter,marfloxacin,medofloxine,mergexin,monoflocet,novecin,nufafloqo,occidal,ocuflox,oflocee,oflocet,oflocin,oflodal,oflodex,oflodura,ofloxacin,ofloxacin otic,ofloxacina,ofloxacine,ofloxacino,ofloxacinum,ofloxin,onexacin,operan,orocin,otonil,oxaldin,pharflox,praxin,puiritol,qinolon,quinolon,quotavil,sinflo,tabrin,taravid,tariflox,tarivid,telbit,tructum,uro tarivid,viotisone,visiren,zanocin"	0.4	"g"	0.4	"g"	"18959-7,20384-4,23948-3,25264-3,374-9,375-6,376-4,377-2,3877-8,41408-6,41409-4,41410-2,42653-6,7038-3,72168-8"
 "OOR"		"Ofloxacin/ornidazole"	"Other antibacterials"	"J01RA09"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
-"OLE"	72493	"Oleandomycin"	"Macrolides/lincosamides"	"J01FA05"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"amimycin,landomycin,matromycin,oleandomicina,oleandomycin,oleandomycin a,oleandomycine,oleandomycinum,romicil"	1	"g"			""
-"OMC"	54697325	"Omadacycline"	"Tetracyclines"	"J01AA15"			""	"amadacycline,omadacycline"	0.3	"g"	0.1	"g"	""
-"OPT"	87880	"Optochin"	"Other antibacterials"	"NA"			""	"numoquin,optochin,optoquine"					""
-"ORB"	60605	"Orbifloxacin"	"Quinolones"	"NA"			""	"orbifloxacin"					""
-"ORI"	16136912	"Oritavancin"	"Glycopeptides"	"J01XA05"	"Other antibacterials"	"Glycopeptide antibacterials"	"orit"	"kimyrsa,oritavancin"					""
-"ORS"		"Ormetroprim/sulfamethoxazole"	"Other antibacterials"	"NA"			""	""					""
-"ORN"	28061	"Ornidazole"	"Other antibacterials"	"G01AF06,J01XD03,P01AB03"	"Other antibacterials"	"Imidazole derivatives"	""	"madelen,ornidal,ornidazol,ornidazole,ornidazolum,tiberal"	1.5	"g"	1	"g"	""
+"OLE"	72493	"Oleandomycin"	"Macrolides/lincosamides"	"J01FA05"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"amimycin,landomycin,matromycin,oleandomicina,oleandomycin,oleandomycin a,oleandomycine,oleandomycinum,romicil"	1	"g"			"18960-5,378-0,379-8,380-6,381-4,55690-2"
+"OMC"	54697325	"Omadacycline"	"Tetracyclines"	"J01AA15"			""	"amadacycline,omadacycline"	0.3	"g"	0.1	"g"	"73594-4,73616-5,73639-7"
+"OPT"	87880	"Optochin"	"Other antibacterials"	"NA"			""	"numoquin,optochin,optoquine"					"100055-3,73665-2"
+"ORB"	60605	"Orbifloxacin"	"Quinolones"	"NA"			""	"orbifloxacin"					"35825-9,35826-7,35827-5"
+"ORI"	16136912	"Oritavancin"	"Glycopeptides"	"J01XA05"	"Other antibacterials"	"Glycopeptide antibacterials"	"orit"	"kimyrsa,oritavancin"					"41707-1,41708-9,41709-7,41736-0"
+"ORS"		"Ormetroprim/sulfamethoxazole"	"Other antibacterials"	"NA"			""	""					"73593-6,73615-7,73638-9"
+"ORN"	28061	"Ornidazole"	"Other antibacterials"	"G01AF06,J01XD03,P01AB03"	"Other antibacterials"	"Imidazole derivatives"	""	"madelen,ornidal,ornidazol,ornidazole,ornidazolum,tiberal"	1.5	"g"	1	"g"	"55691-0,55692-8,55693-6,55694-4"
 "OTE"	77050711	"Oteseconazole"	"Antifungals/antimycotics"	"J02AC06"	"Antimycotics for systemic use"	"Triazole derivatives"	""	"oteseconazole"					""
-"OXA"	6196	"Oxacillin"	"Beta-lactams/penicillins"	"J01CF04"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"ox,oxa,oxac,oxal,oxs"	"bactocill,ossacillina,oxacilina,oxacillin,oxacillin sodium,oxacilline,oxacillinum,oxazocillin,oxazocilline,prostaphlin,prostaphlyn,sodium oxacillin"	2	"g"	2	"g"	"25265-0,3882-8"
+"OXA"	6196	"Oxacillin"	"Beta-lactams/penicillins"	"J01CF04"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase resistant penicillins"	"ox,oxa,oxac,oxal,oxs"	"bactocill,ossacillina,oxacilina,oxacillin,oxacillin sodium,oxacilline,oxacillinum,oxazocillin,oxazocilline,prostaphlin,prostaphlyn,sodium oxacillin"	2	"g"	2	"g"	"18961-3,25265-0,382-2,383-0,384-8,385-5,3882-8,7039-1"
 "OXO"	4628	"Oxolinic acid"	"Quinolones"	"J01MB05"	"Quinolone antibacterials"	"Other quinolones"	""	"acide oxolinique,acido ossolico,acido oxolinico,acidum oxolinicum,aqualinic,cistopax,dioxacin,emyrenil,gramurin,inoxyl,nidantin,oksaren,orthurine,ossian,oxoboi,oxolinic,oxolinic acid,pietil,prodoxal,prodoxol,starner,tiurasin,ultibid,urinox,uritrate,urotrate,uroxol,utibid"	1	"g"			""
-"OXY"	54675779	"Oxytetracycline"	"Tetracyclines"	"D06AA03,G01AA07,J01AA06,S01AA04"	"Tetracyclines"	"Tetracyclines"	""	"adamycin,berkmycen,biostat,biostat pa,bisolvomycin,dabicycline,dalimycin,embryostat,fanterrin,galsenomycin,geomycin,geotilin,hydroxytetracyclinum,imperacin,lenocycline,macocyn,medamycin,mepatar,oksisyklin,ossitetraciclina,oxacycline,oxitetraciclina,oxitetracyclin,oxitetracycline,oxitetracyclinum,oxydon,oxymycin,oxymykoin,oxypam,oxysteclin,oxyterracin,oxyterracine,oxyterracyne,oxytetracid,oxytetracyclin,oxytetracycline,oxytetracycline base,oxytetracyclinum,proteroxyna,riomitsin,ryomycin,solkaciclina,stecsolin,stevacin,tarocyn,tarosin,teravit,terrafungine,terramitsin,terramycin,terramycin im,terramycine,tetran,unimycin,ursocyclin,ursocycline,vendarcin"	1	"g"	1	"g"	"17396-3,25266-8,87595-5"
+"OXY"	54675779	"Oxytetracycline"	"Tetracyclines"	"D06AA03,G01AA07,J01AA06,S01AA04"	"Tetracyclines"	"Tetracyclines"	""	"adamycin,berkmycen,biostat,biostat pa,bisolvomycin,dabicycline,dalimycin,embryostat,fanterrin,galsenomycin,geomycin,geotilin,hydroxytetracyclinum,imperacin,lenocycline,macocyn,medamycin,mepatar,oksisyklin,ossitetraciclina,oxacycline,oxitetraciclina,oxitetracyclin,oxitetracycline,oxitetracyclinum,oxydon,oxymycin,oxymykoin,oxypam,oxysteclin,oxyterracin,oxyterracine,oxyterracyne,oxytetracid,oxytetracyclin,oxytetracycline,oxytetracycline base,oxytetracyclinum,proteroxyna,riomitsin,ryomycin,solkaciclina,stecsolin,stevacin,tarocyn,tarosin,teravit,terrafungine,terramitsin,terramycin,terramycin im,terramycine,tetran,unimycin,ursocyclin,ursocycline,vendarcin"	1	"g"	1	"g"	"17396-3,18962-1,25266-8,386-3,387-1,388-9,389-7,55699-3,87595-5"
 "OZN"		"Ozenoxacin"		"D06AX14"			""	"ozadub,ozenoxacin,ozenoxacin cream"					""
 "PAS"	4649	"P-aminosalicylic acid"	"Antimycobacterials"	"NA"			""	"aminopar,aminosalicylic,aminosalicylic acid,aminosalyl,aminox,apacil,deapasil,entepas,ferrosan,gabbropas,granupas,helipidyl,hellipidyl,neopasalate,osacyl,pamacyl,pamisyl,paramycin,parasal,parasalicil,parasalindon,pasalon,pasara,pascorbic,pasdium,paser granules,paskalium,pasmed,pasnodia,pasolac,propasa,rezipas,teebacin"					""
-"PAN"	72015	"Panipenem"	"Carbapenems"	"NA,J01DH55"			""	"panipenem,panipenem/betamipron,panipenemum,penipanem"					""
-"PAR"	165580	"Paromomycin"	"Other antibacterials"	"A07AA06"			""	"aminosidin,aminosidine,aminosidine i,aminosidine sulfate,amminosidin,crestomycin,estomycin,gabbromicina,gabbromycin,gabromycin,humatin,humycin,hydroxymycin,hydroxymycin sulfate,monomycin,monomycin a,neomycin e,paramomycin,paramomycin sulfate,paromomicina,paromomycin,paromomycin i,paromomycine,paromomycinum,paucimycin,paucimycinum,quintomycin c"	3	"g"			""
+"PAN"	72015	"Panipenem"	"Carbapenems"	"NA,J01DH55"			""	"panipenem,panipenem/betamipron,panipenemum,penipanem"					"100056-1,53823-1"
+"PAR"	165580	"Paromomycin"	"Other antibacterials"	"A07AA06"			""	"aminosidin,aminosidine,aminosidine i,aminosidine sulfate,amminosidin,crestomycin,estomycin,gabbromicina,gabbromycin,gabromycin,humatin,humycin,hydroxymycin,hydroxymycin sulfate,monomycin,monomycin a,neomycin e,paramomycin,paramomycin sulfate,paromomicina,paromomycin,paromomycin i,paromomycine,paromomycinum,paucimycin,paucimycinum,quintomycin c"	3	"g"			"51719-3,53824-9,55700-9,55701-7,55702-5"
 "PAZ"	65957	"Pazufloxacin"	"Quinolones"	"J01MA18"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"pazufloxacin,pazufloxacine,pazufloxacino,pazufloxacinum"			1	"g"	""
-"PEF"	51081	"Pefloxacin"	"Quinolones"	"J01MA03"	"Quinolone antibacterials"	"Fluoroquinolones"	"pefl"	"abactal,labocton,pefloxacin,pefloxacine,pefloxacinium,pefloxacino,pefloxacinum,perfloxacin,silver pefloxacin"	0.8	"g"	0.8	"g"	"3906-5"
+"PEF"	51081	"Pefloxacin"	"Quinolones"	"J01MA03"	"Quinolone antibacterials"	"Fluoroquinolones"	"pefl"	"abactal,labocton,pefloxacin,pefloxacine,pefloxacinium,pefloxacino,pefloxacinum,perfloxacin,silver pefloxacin"	0.8	"g"	0.8	"g"	"18963-9,35828-3,390-5,3906-5,7040-9"
 "PNM"	10250769	"Penamecillin"	"Beta-lactams/penicillins"	"J01CE06"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"hydroxymethyl,penamecilina,penamecillin,penamecillina,penamecilline,penamecillinum"	1.05	"g"			""
-"PNO"		"Penicillin/novobiocin"	"Beta-lactams/penicillins"	"NA"			""	""					""
+"PNO"		"Penicillin/novobiocin"	"Beta-lactams/penicillins"	"NA"			""	""					"35872-1,35873-9,35874-7"
 "PSU"		"Penicillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
 "PNM1"	54686187	"Penimepicycline"	"Tetracyclines"	"J01AA10"	"Tetracyclines"	"Tetracyclines"	""	"criseocil,duamine,geotricyn,hydrocycline,penetracyne,penimepiciclina,penimepicycline,penimepicyclinum"					""
 "PIM"	65453	"Pentisomicin"	"Aminoglycosides"	"NA"			""	"pentisomicin,pentisomicina,pentisomicine,pentisomicinum"					""
@ -326,80 +326,80 @@
 "PHN"	6869	"Phenoxymethylpenicillin"	"Beta-lactams/penicillins"	"J01CE02"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	"fepe,peni v,penicillin v,pnv,pv"	"acipen v,apocillin,apopen,beromycin,calcipen,compocillin v,crystapen v,distaquaine v,eskacillian v,eskacillin v,fenacilin,fenospen,meropenin,oracillin,oratren,pc pen vk,penicillin v,penicillinv,phenocillin,phenomycilline,phenopenicillin,robicillin,rocilin,stabicillin,vebecillin,veetids,vegacillin"	2	"g"			""
 "PMR"	5284447	"Pimaricin"	"Antifungals/antimycotics"	"NA"			"natamycin"	"delvocid,delvolan,delvopos,mycophyt,myprozine,natacyn,natafucin,natamicina,natamycin,natamycine,natamycinum,pimafucin,pimaracin,pimaricin,pimaricine,pimarizin,synogil,tennecetin"					""
 "PPA"	4831	"Pipemidic acid"	"Quinolones"	"J01MB04"	"Quinolone antibacterials"	"Other quinolones"	"pipz,pizu"	"acide pipemidique,acido pipemidico,acidum pipemidicum,deblaston,dolcol,filtrax,pipedac,pipemid,pipemidate,pipemidic,pipemidic acid,pipemidicacid,pipram,pipurin,tractur,uromidin,urosten,uroval"	0.8	"g"			""
-"PIP"	43672	"Piperacillin"	"Beta-lactams/penicillins"	"J01CA12"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"pi,pip,pipc,pipe,pp"	"isipen,pentcillin,peperacillin,peracin,piperacilina,piperacillin,piperacillin hydrate,piperacillin na,piperacillin sodium,piperacillina,piperacilline,piperacillinum,pipercillin,pipracil,pipril,tazocin"			14	"g"	"25268-4,3972-7"
-"PIS"		"Piperacillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					""
-"TZP"	461573	"Piperacillin/tazobactam"	"Beta-lactams/penicillins"	"J01CR05"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	"p/t,piptaz,piptazo,pit,pita,pt,ptc,ptz,tzp"	"tazocel,tazocillin,tazocin,zosyn"			14	"g"	""
+"PIP"	43672	"Piperacillin"	"Beta-lactams/penicillins"	"J01CA12"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"pi,pip,pipc,pipe,pp"	"isipen,pentcillin,peperacillin,peracin,piperacilina,piperacillin,piperacillin hydrate,piperacillin na,piperacillin sodium,piperacillina,piperacilline,piperacillinum,pipercillin,pipracil,pipril,tazocin"			14	"g"	"101490-1,101491-9,18969-6,18970-4,25268-4,3972-7,407-7,408-5,409-3,410-1,411-9,412-7,413-5,414-3,54197-9,54198-7,54199-5,55704-1,7043-3,7044-1"
+"PIS"		"Piperacillin/sulbactam"	"Beta-lactams/penicillins"	"NA"			""	""					"54197-9,54198-7,54199-5,55704-1"
+"TZP"	461573	"Piperacillin/tazobactam"	"Beta-lactams/penicillins"	"J01CR05"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	"p/t,piptaz,piptazo,pit,pita,pt,ptc,ptz,tzp"	"tazocel,tazocillin,tazocin,zosyn"			14	"g"	"101491-9,18970-4,411-9,412-7,413-5,414-3,7044-1"
 "PRC"	71978	"Piridicillin"	"Beta-lactams/penicillins"	"NA"			""	"piridicillin"					""
-"PRL"	157385	"Pirlimycin"	"Macrolides/lincosamides"	"NA"			""	"pirlimycin,pirlimycina,pirlimycine,pirlimycinum,pirsue"					""
+"PRL"	157385	"Pirlimycin"	"Macrolides/lincosamides"	"NA"			""	"pirlimycin,pirlimycina,pirlimycine,pirlimycinum,pirsue"					"35829-1,35830-9,35831-7"
 "PIR"	4855	"Piromidic acid"	"Quinolones"	"J01MB03"	"Quinolone antibacterials"	"Other quinolones"	""	"acide piromidique,acido piromidico,acidum piromidicum,actrun c,bactramyl,enterol,gastrurol,panacid,pirodal,piromidate,piromidic acid,piromidicacid,pyrido,reelon,septural,urisept,uropir,zaomeal"	2	"g"			""
-"PVM"	33478	"Pivampicillin"	"Beta-lactams/penicillins"	"J01CA02"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"berocillin,pivaloylampicillin,pivampicilina,pivampicillin,pivampicilline,pivampicillinum,pondocillin"	1.05	"g"			""
+"PVM"	33478	"Pivampicillin"	"Beta-lactams/penicillins"	"J01CA02"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"berocillin,pivaloylampicillin,pivampicilina,pivampicillin,pivampicilline,pivampicillinum,pondocillin"	1.05	"g"			"18971-2,415-0,416-8,417-6,418-4"
 "PME"	115163	"Pivmecillinam"	"Beta-lactams/penicillins"	"J01CA08"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"amdinocillin pivoxil,coactabs,hydroxymethyl,pivmecilinamo,pivmecillinam,pivmecillinam hcl,pivmecillinamum"	0.6	"g"			""
-"PLZ"	42613186	"Plazomicin"	"Aminoglycosides"	"J01GB14"			""	"plazomicin,zemdri"					"92024-9"
-"PLB"	49800004	"Polymyxin B"	"Polymyxins"	"A07AA05,J01XB02,S01AA18,S02AA11,S03AA03"	"Other antibacterials"	"Polymyxins"	"pb,pol,polb,poly,poly b,polymixin,polymixin b"	"polimixina b,polumyxin b,polymixin b,polymyxine b"	3	"MU"	0.15	"g"	"17473-0,25269-2"
+"PLZ"	42613186	"Plazomicin"	"Aminoglycosides"	"J01GB14"			""	"plazomicin,zemdri"					"73592-8,73614-0,73637-1,92024-9,94719-2"
+"PLB"	49800004	"Polymyxin B"	"Polymyxins"	"A07AA05,J01XB02,S01AA18,S02AA11,S03AA03"	"Other antibacterials"	"Polymyxins"	"pb,pol,polb,poly,poly b,polymixin,polymixin b"	"polimixina b,polumyxin b,polymixin b,polymyxine b"	3	"MU"	0.15	"g"	"17473-0,18972-0,25269-2,35832-5,419-2,420-0,421-8,422-6"
 "POP"		"Polymyxin B/polysorbate 80"	"Polymyxins"	"NA"			""	""					""
-"POS"	468595	"Posaconazole"	"Antifungals/antimycotics"	"J02AC04"	"Antimycotics for systemic use"	"Triazole derivatives"	"posa"	"noxafil,posaconazole,posaconazole sp,posconazole"	0.3	"g"	0.3	"g"	"53731-6,80545-7"
-"PRA"	9802884	"Pradofloxacin"	"Quinolones"	"NA"			""	"pradofloxacin,pudofloxacin,veraflox"					""
-"PRX"	71455	"Premafloxacin"	"Quinolones"	"NA"			""	"premafloxacin,remafloxacin"					""
-"PMD"	456199	"Pretomanid"	"Antimycobacterials"	"J04AK08"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	""	"oxazine,pretomanid"					""
+"POS"	468595	"Posaconazole"	"Antifungals/antimycotics"	"J02AC04"	"Antimycotics for systemic use"	"Triazole derivatives"	"posa"	"noxafil,posaconazole,posaconazole sp,posconazole"	0.3	"g"	0.3	"g"	"53731-6,54186-2,54187-0,54188-8,54189-6,80545-7"
+"PRA"	9802884	"Pradofloxacin"	"Quinolones"	"NA"			""	"pradofloxacin,pudofloxacin,veraflox"					"76148-6,87800-9"
+"PRX"	71455	"Premafloxacin"	"Quinolones"	"NA"			""	"premafloxacin,remafloxacin"					"73591-0,73613-2,73636-3"
+"PMD"	456199	"Pretomanid"	"Antimycobacterials"	"J04AK08"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	""	"oxazine,pretomanid"					"93850-6"
 "PRM"	6446787	"Primycin"	"Macrolides/lincosamides"	"NA"			""	"primycin"					""
-"PRI"	11979535	"Pristinamycin"	"Macrolides/lincosamides"	"J01FG01"	"Macrolides, lincosamides and streptogramins"	"Streptogramins"	"pris"	"eskalin v,mikamycin,mikamycine,mikamycinum,ostreogrycinum,pristinamycine,pristinamycinum,stafac,stafytracine,staphylomycin,starfac,streptogramin,vernamycin,virgimycin,virgimycine,virginiamycin,virginiamycina,virginiamycine,virginiamycinum"	2	"g"			""
+"PRI"	11979535	"Pristinamycin"	"Macrolides/lincosamides"	"J01FG01"	"Macrolides, lincosamides and streptogramins"	"Streptogramins"	"pris"	"eskalin v,mikamycin,mikamycine,mikamycinum,ostreogrycinum,pristinamycine,pristinamycinum,stafac,stafytracine,staphylomycin,starfac,streptogramin,vernamycin,virgimycin,virgimycine,virginiamycin,virginiamycina,virginiamycine,virginiamycinum"	2	"g"			"32383-2,35833-3,35834-1,55709-0"
 "PRB"	5903	"Procaine benzylpenicillin"	"Beta-lactams/penicillins"	"J01CE09"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"depocillin,duphapen,hostacillin,hydracillin,jenacillin o,nopcaine,penicillin procaine,retardillin,vetspen,vitablend"			0.6	"g"	""
 "PRP"	92879	"Propicillin"	"Beta-lactams/penicillins"	"J01CE03"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase sensitive penicillins"	""	"propicilina,propicillin,propicilline,propicillinum"	0.9	"g"			""
 "PKA"	9872451	"Propikacin"	"Aminoglycosides"	"NA"			""	"propikacin,propikacina,propikacine,propikacinum"					""
 "PTH"	666418	"Protionamide"	"Antimycobacterials"	"J04AD01"	"Drugs for treatment of tuberculosis"	"Thiocarbamide derivatives"	"prot"	"ektebin,peteha,prothionamide,prothionamidum,protion,protionamid,protionamida,protionamide,protionamidum,protionizina,tebeform,trevintix,tuberex"	0.75	"g"			""
-"PRU"	65947	"Prulifloxacin"	"Quinolones"	"J01MA17"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"prulifloxacin,pruvel,pufloxacin dioxolil,quisnon"	0.6	"g"			""
-"PZA"	1046	"Pyrazinamide"	"Antimycobacterials"	"J04AK01"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"pyra"	"aldinamid,aldinamide,braccopiral,corsazinmid,dipimide,eprazin,farmizina,isopas,lynamide,novamid,p ezetamid,pezetamid,pharozinamide,piraldina,pirazimida,pirazinamid,pirazinamida,pirazinamide,prazina,pyrafat,pyramide,pyrazide,pyrazinamdie,pyrazinamid,pyrazinamide,pyrazinamidum,pyrazine carboxamide,pyrazineamide,pyrizinamide,rifafour,rozide,tebrazid,tebrazio,tisamid,unipyranamide,zinamide,zinastat"	1.5	"g"			"11001-5,25270-0"
-"QDA"	11979418	"Quinupristin/dalfopristin"	"Macrolides/lincosamides"	"J01FG02"	"Macrolides, lincosamides and streptogramins"	"Streptogramins"	"q/d,qda,qida,quda,rp,syn"	""			1.5	"g"	""
+"PRU"	65947	"Prulifloxacin"	"Quinolones"	"J01MA17"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"prulifloxacin,pruvel,pufloxacin dioxolil,quisnon"	0.6	"g"			"100058-7,76145-2"
+"PZA"	1046	"Pyrazinamide"	"Antimycobacterials"	"J04AK01"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"pyra"	"aldinamid,aldinamide,braccopiral,corsazinmid,dipimide,eprazin,farmizina,isopas,lynamide,novamid,p ezetamid,pezetamid,pharozinamide,piraldina,pirazimida,pirazinamid,pirazinamida,pirazinamide,prazina,pyrafat,pyramide,pyrazide,pyrazinamdie,pyrazinamid,pyrazinamide,pyrazinamidum,pyrazine carboxamide,pyrazineamide,pyrizinamide,rifafour,rozide,tebrazid,tebrazio,tisamid,unipyranamide,zinamide,zinastat"	1.5	"g"			"11001-5,18973-8,20461-0,23632-3,25186-8,25229-6,25270-0,423-4,424-2,425-9,426-7,42935-7,55710-8,55711-6,56026-8,92242-7"
+"QDA"	11979418	"Quinupristin/dalfopristin"	"Macrolides/lincosamides"	"J01FG02"	"Macrolides, lincosamides and streptogramins"	"Streptogramins"	"q/d,qda,qida,quda,rp,syn"	""			1.5	"g"	"23640-6,23641-4,33334-4,35835-8,58712-1"
 "RAC"	56052	"Ractopamine"	"Other antibacterials"	"NA"			""	"optaflexx,paylean,ractopamina,ractopamine,ractopaminum"					""
-"RAM"	16132338	"Ramoplanin"	"Glycopeptides"	"NA"			""	"ramoplanin"					""
-"RZM"	10993211	"Razupenem"	"Carbapenems"	"NA"			""	"razupenem"					""
+"RAM"	16132338	"Ramoplanin"	"Glycopeptides"	"NA"			""	"ramoplanin"					"41710-5,41711-3,41712-1,41737-8"
+"RZM"	10993211	"Razupenem"	"Carbapenems"	"NA"			""	"razupenem"					"73590-2,73612-4,73635-5"
 "RTP"	6918462	"Retapamulin"	"Other antibacterials"	"D06AX13"	"Antibiotics for topical use"	"Other antibiotics for topical use"	"ret"	"altabax,altargo,retapamulin"					""
 "RZF"		"Rezafungin"	"Antifungals"	"NA"			""	"biafungin,rezafungin cation,rezafungin ion"					""
 "RBC"	44631912	"Ribociclib"	"Antifungals/antimycotics"	"L01EF02"	"Antimycotics for systemic use"	"Triazole derivatives"	"ribo"	"kisqali,ribociclib"	0.45				""
 "RST"	33042	"Ribostamycin"	"Aminoglycosides"	"J01GB10"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	""	"dekamycin iv,hetangmycin,ribastamin,ribostamicina,ribostamycin,ribostamycine,ribostamycinum,vistamycin,xylostatin"			1	"g"	""
 "RID1"	16659285	"Ridinilazole"	"Other antibacterials"	"NA"			""	"ridinilazole"					""
-"RIB"	135398743	"Rifabutin"	"Antimycobacterials"	"J04AB04"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"rifb"	"alfacid,ansamicin,ansamycin,ansatipin,ansatipine,assatipin,mycobutin,rifabutin,rifabutina,rifabutine,rifabutinum"	0.15	"g"			"24032-5"
+"RIB"	135398743	"Rifabutin"	"Antimycobacterials"	"J04AB04"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"rifb"	"alfacid,ansamicin,ansamycin,ansatipin,ansatipine,assatipin,mycobutin,rifabutin,rifabutina,rifabutine,rifabutinum"	0.15	"g"			"100699-8,16100-0,16386-5,16387-3,19149-4,20386-9,23630-7,24032-5,25199-1,25200-7,25201-5,42655-1,42656-9,54183-9,96113-6"
 "RIF"	135398735	"Rifampicin"	"Antimycobacterials"	"J04AB02"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"rifa"	"abrifam,archidyn,arficin,arzide,azt + rifampin,benemicin,benemycin,dipicin,doloresum,eremfat,famcin,fenampicin,rifadin,rifadin i.v,rifadin i.v.,rifadine,rifagen,rifaldazin,rifaldazine,rifaldin,rifamate,rifamicin amp,rifamor,rifampicin,rifampicin sv,rifampicina,rifampicine,rifampicinum,rifampin,rifamsolin,rifamycin amp,rifapiam,rifaprodin,rifcin,rifinah,rifobac,rifoldin,rifoldine,riforal,rimactan,rimactane,rimactazid,rimactizid,rimazid,rimycin,sinerdol,tubocin"	0.6	"g"	0.6	"g"	""
 "REI"	135483893	"Rifampicin/ethambutol/isoniazid"	"Antimycobacterials"	"J04AM07"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
 "RFI"		"Rifampicin/isoniazid"	"Antimycobacterials"	"J04AM02"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	"rifinah,rimactazid"					""
 "RPEI"		"Rifampicin/pyrazinamide/ethambutol/isoniazid"	"Antimycobacterials"	"J04AM06"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
 "RPI"		"Rifampicin/pyrazinamide/isoniazid"	"Antimycobacterials"	"J04AM05"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
 "RFM"	6324616	"Rifamycin"	"Antimycobacterials"	"A07AA13,D06AX15,J04AB03,S01AA16,S02AA12"	"Drugs for treatment of tuberculosis"	"Antibiotics"	""	"aemcolo,rifacin,rifamicina,rifamicine sv,rifamycin,rifamycine,rifamycinum,rifocin,rifocyn,rifomycin,rifomycin sv,tuborin"			0.6	"g"	""
-"RFP"	135403821	"Rifapentine"	"Antimycobacterials"	"J04AB05"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"rifp,rpt"	"cyclopentyl rifampin,prifitin,priftin,rifapentin,rifapentina,rifapentine,rifapentinum"	0.11	"g"			""
-"RFX"	6436173	"Rifaximin"	"Other antibacterials"	"A07AA11,D06AX11"	"Intestinal antiinfectives"	"Antibiotics"	""	"fatroximin,flonorm,lormyx,lumenax,normix,redactiv,rifacol,rifamixin,rifaxidin,rifaximin,rifaximina,rifaximine,rifaximinum,rifaxin,ritacol,spiraxin,xifaxan,xifaxsan"	0.6	"g"			""
+"RFP"	135403821	"Rifapentine"	"Antimycobacterials"	"J04AB05"	"Drugs for treatment of tuberculosis"	"Antibiotics"	"rifp,rpt"	"cyclopentyl rifampin,prifitin,priftin,rifapentin,rifapentina,rifapentine,rifapentinum"	0.11	"g"			"100059-5,76627-9"
+"RFX"	6436173	"Rifaximin"	"Other antibacterials"	"A07AA11,D06AX11"	"Intestinal antiinfectives"	"Antibiotics"	""	"fatroximin,flonorm,lormyx,lumenax,normix,redactiv,rifacol,rifamixin,rifaxidin,rifaximin,rifaximina,rifaximine,rifaximinum,rifaxin,ritacol,spiraxin,xifaxan,xifaxsan"	0.6	"g"			"73589-4,73611-6,73634-8"
 "RIT"	65633	"Ritipenem"	"Carbapenems"	"NA"			""	"ritipenem"					""
 "RIA"	163692	"Ritipenem acoxil"	"Carbapenems"	"NA"			""	"ritipenem acoxil"					""
 "ROK"	5282211	"Rokitamycin"	"Macrolides/lincosamides"	"J01FA12"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"propionylleucomycin,ricamycin,rokicid,rokital,rokitamicina,rokitamycin,rokitamycine,rokitamycinum"	0.8	"g"			""
-"RLT"	54682938	"Rolitetracycline"	"Tetracyclines"	"J01AA09"	"Tetracyclines"	"Tetracyclines"	""	"bristacin,kinteto,reverin,rolitetraciclina,rolitetracycline,rolitetracyclinum,solvocillin,superciclin,synotodecin,synterin,syntetrex,syntetrin,transcycline,velacicline,velacycline"			0.35	"g"	""
-"ROS"	287180	"Rosoxacin"	"Quinolones"	"J01MB01"	"Quinolone antibacterials"	"Other quinolones"	""	"acrosoxacin,eracine,eradacil,eradacin,eradicin,rosoxacin,rosoxacine,rosoxacino,rosoxacinum,roxadyl,winoxacin,winuron"	0.3	"g"			""
-"RXT"		"Roxithromycin"	"Macrolides/lincosamides"	"J01FA06"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"roxi"	"roxithromycin,roxithromycine,roxithromycinum,roxitromicina,rulide"	0.3	"g"			""
+"RLT"	54682938	"Rolitetracycline"	"Tetracyclines"	"J01AA09"	"Tetracyclines"	"Tetracyclines"	""	"bristacin,kinteto,reverin,rolitetraciclina,rolitetracycline,rolitetracyclinum,solvocillin,superciclin,synotodecin,synterin,syntetrex,syntetrin,transcycline,velacicline,velacycline"			0.35	"g"	"18976-1,435-8,436-6,437-4,438-2"
+"ROS"	287180	"Rosoxacin"	"Quinolones"	"J01MB01"	"Quinolone antibacterials"	"Other quinolones"	""	"acrosoxacin,eracine,eradacil,eradacin,eradicin,rosoxacin,rosoxacine,rosoxacino,rosoxacinum,roxadyl,winoxacin,winuron"	0.3	"g"			"18977-9,439-0,440-8,441-6,442-4,55713-2"
+"RXT"		"Roxithromycin"	"Macrolides/lincosamides"	"J01FA06"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"roxi"	"roxithromycin,roxithromycine,roxithromycinum,roxitromicina,rulide"	0.3	"g"			"18978-7,443-2,444-0,445-7,446-5,7046-6"
 "RFL"	58258	"Rufloxacin"	"Quinolones"	"J01MA10"	"Quinolone antibacterials"	"Fluoroquinolones"	""	"rufloxacin,rufloxacin hcl,rufloxacine,rufloxacino,rufloxacinum"	0.2	"g"			""
-"SAL"	3085092	"Salinomycin"	"Other antibacterials"	"NA"			""	"coxistac,procoxacin,salinomicina,salinomycin,salinomycine,salinomycinum"					"87593-0"
-"SAR"	56208	"Sarafloxacin"	"Quinolones"	"NA"			""	"difloxacine,difloxacino,difloxacinum,quinolone der.,saraflox,sarafloxacin,sarafloxacine,sarafloxacino,sarafloxacinum"					""
+"SAL"	3085092	"Salinomycin"	"Other antibacterials"	"NA"			""	"coxistac,procoxacin,salinomicina,salinomycin,salinomycine,salinomycinum"					"35836-6,35837-4,35838-2,87593-0"
+"SAR"	56208	"Sarafloxacin"	"Quinolones"	"NA"			""	"difloxacine,difloxacino,difloxacinum,quinolone der.,saraflox,sarafloxacin,sarafloxacine,sarafloxacino,sarafloxacinum"					"73588-6,73610-8,73633-0"
 "SRC"	54681908	"Sarecycline"	"Tetracyclines"	"J01AA14"	"Tetracyclines"	"Tetracyclines"	""	"sarecycline,seysara"	0.1	"g"			""
 "SRX"	9933415	"Sarmoxicillin"	"Beta-lactams/penicillins"	"NA"			""	"sarmoxicillin"					""
 "SEC"	71815	"Secnidazole"	"Other antibacterials"	"P01AB07"			""	"flagentyl,secnidal,secnidazol,secnidazole,secnidazolum,secnil,sindose,solosec"	2	"g"			""
 "SMF"		"Simvastatin/fenofibrate"	"Antimycobacterials"	"C10BA04"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	"simv"	""					""
-"SIS"	36119	"Sisomicin"	"Aminoglycosides"	"J01GB08"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"siso"	"rickamicin,salvamina,siseptin sulfate,sisomicin,sisomicin sulfate,sisomicina,sisomicine,sisomicinum,sisomin,sisomycin,sissomicin,sizomycin"			0.24	"g"	""
+"SIS"	36119	"Sisomicin"	"Aminoglycosides"	"J01GB08"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"siso"	"rickamicin,salvamina,siseptin sulfate,sisomicin,sisomicin sulfate,sisomicina,sisomicine,sisomicinum,sisomin,sisomycin,sissomicin,sizomycin"			0.24	"g"	"18979-5,447-3,448-1,449-9,450-7,55714-0"
 "SIT"	461399	"Sitafloxacin"	"Quinolones"	"J01MA21"			""	"gracevit,sitafloxacin,sitafloxacinisomer"	0.1	"g"			""
 "SDA"	2724368	"Sodium aminosalicylate"	"Antimycobacterials"	"J04AA02"	"Drugs for treatment of tuberculosis"	"Aminosalicylic acid and derivatives"	""	"bactylan,decapasil,lepasen,monopas,nippas,p.a.s. sodium,pamisyl sodium,parasal sodium,pas sodium,pasade,pasnal,passodico,salvis,sanipirol,sodiopas,sodium p.a.s,sodium pas,teebacin,tubersan"	14	"g"	14	"g"	""
-"SOL"	25242512	"Solithromycin"	"Macrolides/lincosamides"	"J01FA16"			""	"solithera,solithromycin"					""
-"SPX"	60464	"Sparfloxacin"	"Quinolones"	"J01MA09"	"Quinolone antibacterials"	"Fluoroquinolones"	"spa,spar"	"esparfloxacino,sparfloxacin,sparfloxacine,sparfloxacinum"	0.2	"g"			""
-"SPT"	15541	"Spectinomycin"	"Other antibacterials"	"J01XX04"	"Other antibacterials"	"Other antibacterials"	"sc,spe,spec,spt"	"actinospectacina,adspec,espectinomicina,prospec,specitinomycin,spectam,spectinomicina,spectinomycin,spectinomycin di hcl,spectinomycine,spectinomycinum,stanilo,togamycin,trobicin"			3	"g"	""
-"SPI"	6419898	"Spiramycin"	"Macrolides/lincosamides"	"J01FA02"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"spir"	"espiramicin,provamycin,rovamycin,rovamycine,sequamycin,spiramycine,spiramycinum"	3	"g"			""
+"SOL"	25242512	"Solithromycin"	"Macrolides/lincosamides"	"J01FA16"			""	"solithera,solithromycin"					"73587-8,73609-0,73632-2"
+"SPX"	60464	"Sparfloxacin"	"Quinolones"	"J01MA09"	"Quinolone antibacterials"	"Fluoroquinolones"	"spa,spar"	"esparfloxacino,sparfloxacin,sparfloxacine,sparfloxacinum"	0.2	"g"			"20397-6,23610-9,23628-1,35839-0,7047-4"
+"SPT"	15541	"Spectinomycin"	"Other antibacterials"	"J01XX04"	"Other antibacterials"	"Other antibacterials"	"sc,spe,spec,spt"	"actinospectacina,adspec,espectinomicina,prospec,specitinomycin,spectam,spectinomicina,spectinomycin,spectinomycin di hcl,spectinomycine,spectinomycinum,stanilo,togamycin,trobicin"			3	"g"	"18980-3,35840-8,451-5,452-3,453-1,454-9"
+"SPI"	6419898	"Spiramycin"	"Macrolides/lincosamides"	"J01FA02"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"spir"	"espiramicin,provamycin,rovamycin,rovamycine,sequamycin,spiramycine,spiramycinum"	3	"g"			"18981-1,455-6,456-4,457-2,458-0,55715-7"
 "SPM"		"Spiramycin/metronidazole"	"Other antibacterials"	"J01RA04"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "STR"		"Streptoduocin"	"Aminoglycosides"	"J01GA02"	"Aminoglycoside antibacterials"	"Streptomycins"	""	"ambistrin"			1	"g"	""
-"STR1"	19649	"Streptomycin"	"Aminoglycosides"	"A07AA04,J01GA01"	"Aminoglycoside antibacterials"	"Streptomycins"	"s,stm,str,stre"	"agrept,agrimycin,chemform,estreptomicina,neodiestreptopab,strepcen,streptomicina,streptomycin,streptomycin a,streptomycin spx,streptomycin sulfate,streptomycine,streptomycinum,streptomyzin,vetstrep"			1	"g"	"4039-4"
-"STH"		"Streptomycin-high"	"Aminoglycosides"	"NA"			"sthi,sthl,strepto high,streptomycin high"	""					""
+"STR1"	19649	"Streptomycin"	"Aminoglycosides"	"A07AA04,J01GA01"	"Aminoglycoside antibacterials"	"Streptomycins"	"s,stm,str,stre"	"agrept,agrimycin,chemform,estreptomicina,neodiestreptopab,strepcen,streptomicina,streptomycin,streptomycin a,streptomycin spx,streptomycin sulfate,streptomycine,streptomycinum,streptomyzin,vetstrep"			1	"g"	"18982-9,18983-7,20462-8,23626-5,25185-0,25205-6,25206-4,35841-6,4039-4,42658-5,42659-3,459-8,460-6,461-4,462-2,46719-1,48177-0,6933-6,7048-2,7049-0,96114-4"
+"STH"		"Streptomycin-high"	"Aminoglycosides"	"NA"			"sthi,sthl,strepto high,streptomycin high"	""					"18983-7,35841-6,6933-6,7049-0"
 "STI"		"Streptomycin/isoniazid"	"Antimycobacterials"	"J04AM01"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
-"SUL"	130313	"Sulbactam"	"Beta-lactams/penicillins"	"J01CG01"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase inhibitors"	""	"betamaze,sulbactam,sulbactam acid,sulbactam free acid,sulbactamum"			1	"g"	""
+"SUL"	130313	"Sulbactam"	"Beta-lactams/penicillins"	"J01CG01"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase inhibitors"	""	"betamaze,sulbactam,sulbactam acid,sulbactam free acid,sulbactamum"			1	"g"	"41716-2,41717-0,41718-8,41739-4"
 "SBC"	20055036	"Sulbenicillin"	"Beta-lactams/penicillins"	"J01CA16"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"kedacillina,sulbenicilina,sulbenicillin,sulbenicilline,sulbenicillinum"			15	"g"	""
 "SUC"	5318	"Sulconazole"	"Antifungals/antimycotics"	"D01AC09"			""	"sulconazol,sulconazole,sulconazolum"					""
 "SUP"	6634	"Sulfachlorpyridazine"	"Other antibacterials"	"NA"			""	"cluricol,cosulid,cosumix,durasulf,nefrosul,nsulfanilamide,prinzone vet,prinzone vet.,solfaclorpiridazina,sonilyn,sulfachlorpyridazine,sulfacloropiridazina,vetisulid"					""
-"SDI"	5215	"Sulfadiazine"	"Trimethoprims"	"J01EC02"	"Sulfonamides and trimethoprim"	"Intermediate-acting sulfonamides"	""	"adiazin,adiazine,cocodiazine,codiazine,cremodiazine,cremotres,debenal,deltazina,diazin,diazolone,diazovit,diazyl,eskadiazine,honey diazine,liquadiazine,microsulfon,neazine,neotrizine,nsulfanilamide,palatrize,piridisir,pirimal,pyrimal,quadetts,quadramoid,sanodiazine,sildaflo,silvadene,solfadiazina,spofadrizine,sterazine,sulfacombin,sulfadiazene,sulfadiazin,sulfadiazina,sulfadiazine,sulfadiazinum,sulfapirimidin,sulfapyrimidin,sulfapyrimidine,sulfatryl,sulfazine,sulfolex,sulfonamides duplex,sulfonsol,sulfose,sulphadiazine,sulphadiazine e,terfonyl,theradiazine,thermazene,trifonamide,triple sulfa,triple sulfas,trisem,truozine,zinc sulfadiazine"	0.6	"g"			"27216-1,59742-7,6907-0"
+"SDI"	5215	"Sulfadiazine"	"Trimethoprims"	"J01EC02"	"Sulfonamides and trimethoprim"	"Intermediate-acting sulfonamides"	""	"adiazin,adiazine,cocodiazine,codiazine,cremodiazine,cremotres,debenal,deltazina,diazin,diazolone,diazovit,diazyl,eskadiazine,honey diazine,liquadiazine,microsulfon,neazine,neotrizine,nsulfanilamide,palatrize,piridisir,pirimal,pyrimal,quadetts,quadramoid,sanodiazine,sildaflo,silvadene,solfadiazina,spofadrizine,sterazine,sulfacombin,sulfadiazene,sulfadiazin,sulfadiazina,sulfadiazine,sulfadiazinum,sulfapirimidin,sulfapyrimidin,sulfapyrimidine,sulfatryl,sulfazine,sulfolex,sulfonamides duplex,sulfonsol,sulfose,sulphadiazine,sulphadiazine e,terfonyl,theradiazine,thermazene,trifonamide,triple sulfa,triple sulfas,trisem,truozine,zinc sulfadiazine"	0.6	"g"			"18984-5,27216-1,463-0,464-8,465-5,466-3,59742-7,6907-0,7050-8"
 "SLT"	122284	"Sulfadiazine/tetroxoprim"	"Trimethoprims"	"J01EE06"	"Sulfonamides and trimethoprim"	"Combinations of sulfonamides and trimethoprim, incl. derivatives"	""	"cotetroxazine"					""
 "SLT1"	64932	"Sulfadiazine/trimethoprim"	"Trimethoprims"	"J01EE02"	"Sulfonamides and trimethoprim"	"Combinations of sulfonamides and trimethoprim, incl. derivatives"	""	"antastmon,cotrimazine,diaziprim forte,ditrim,ditrivet,sultrisan,triglobe,trimin,tucoprim,uniprim"					""
-"SUD"	5323	"Sulfadimethoxine"	"Trimethoprims"	"J01ED01"	"Sulfonamides and trimethoprim"	"Long-acting sulfonamides"	""	"agribon,arnosulfan,bactrovet,deposul,diasulfa,diasulfyl,dimetazina,dinosol,dorisul,lasibon,madribon,madrigid,madriqid,madroxin,madroxine,maxulvet,mecozine,memcozine,metoxidon,neostrepal,neostreptal,nsulfanilamide,omnibon,persulfen,primor,radonin,redifal,rofenaid,roscosulf,scandisil,solfadimetossina,sudine,suldixine,sulfabon,sulfadimethoxin,sulfadimethoxine,sulfadimethoxinum,sulfadimetossina,sulfadimetoxin,sulfadimetoxina,sulfadimetoxine,sulfadimoxine,sulfastop,sulfdimethoxine,sulfoplan,sulphadimethoxine,sulxin,sumbio,symbio,theracanzan,ultrasulfon"	0.5	"g"			""
+"SUD"	5323	"Sulfadimethoxine"	"Trimethoprims"	"J01ED01"	"Sulfonamides and trimethoprim"	"Long-acting sulfonamides"	""	"agribon,arnosulfan,bactrovet,deposul,diasulfa,diasulfyl,dimetazina,dinosol,dorisul,lasibon,madribon,madrigid,madriqid,madroxin,madroxine,maxulvet,mecozine,memcozine,metoxidon,neostrepal,neostreptal,nsulfanilamide,omnibon,persulfen,primor,radonin,redifal,rofenaid,roscosulf,scandisil,solfadimetossina,sudine,suldixine,sulfabon,sulfadimethoxin,sulfadimethoxine,sulfadimethoxinum,sulfadimetossina,sulfadimetoxin,sulfadimetoxina,sulfadimetoxine,sulfadimoxine,sulfastop,sulfdimethoxine,sulfoplan,sulphadimethoxine,sulxin,sumbio,symbio,theracanzan,ultrasulfon"	0.5	"g"			"87799-3,87803-3"
 "SDM"	5327	"Sulfadimidine"	"Trimethoprims"	"J01EB03"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	""	"azolmetazin,benzene sulfonamide,calfspan,calfspan tablets,cremomethazine,diazil,diazilsulfadine,dimezathine,intradine,kelametazine,mermeth,metazin,neasina,neazina,nsulfanilamide,panazin,pirmazin,primazin,sa iii,solfadimidina,spanbolet,sulfadimerazine,sulfadimesin,sulfadimesine,sulfadimethyldiazine,sulfadimezin,sulfadimezine,sulfadimezinum,sulfadimidin,sulfadimidina,sulfadimidine,sulfadimidinum,sulfadine,sulfametazina,sulfametazyny,sulfamethazine,sulfamethiazine,sulfamezathine,sulfamidine,sulfasure sr bolus,sulfodimesin,sulfodimezine,sulka k boluses,sulka s boluses,sulmet,sulphadimidine,sulphamethasine,sulphamethazine,sulphamezathine,sulphamidine,sulphodimezine,superseptil,superseptyl,vertolan"	4	"g"			""
 "SLT2"		"Sulfadimidine/trimethoprim"	"Trimethoprims"	"J01EE05"	"Sulfonamides and trimethoprim"	"Combinations of sulfonamides and trimethoprim, incl. derivatives"	""	""					""
 "SLF"	5344	"Sulfafurazole"	"Trimethoprims"	"J01EB05,S01AB02"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	"sfsz"	"accuzole,alphazole,amidoxal,astrazolo,azo gantrisin,azosulfizin,bactesulf,barazae,chemouag,cosoxazole,dorsulfan,dorsulfan warthausen,entusil,entusul,eryzole,gantrisin,gantrisine,gantrisona,gantrizin,gantrosan,isoxamin,neazolin,neoxazoi,neoxazol,novazolo,novosaxazole,nsulfanilamide,nsulphanilamide,pancid,pediazole,renosulfan,resoxol,roxosul,roxosul tablets,roxoxol,saxosozine,sodizole,solfafurazolo,soxamide,soxazole,soxisol,soxitabs,soxomide,stansin,sulbio,sulfafuraz ole,sulfafurazol,sulfafurazole,sulfafurazolum,sulfagan,sulfagen,sulfaisoxazole,sulfalar,sulfapolar,sulfasol,sulfasoxazole,sulfasoxizole,sulfazin,sulfisin,sulfisonazole,sulfisoxasole,sulfisoxazol,sulfisoxazole,sulfisoxazolum,sulfizin,sulfizol,sulfizole,sulfofurazole,sulfoxol,suloxsol,sulphafuraz,sulphafurazol,sulphafurazole,sulphafurazolum,sulphaisoxazole,sulphisoxazol,sulphisoxazole,sulphofurazole,sulsoxin,thiasin,unisulf,urisoxin,uritrisin,urogan,vagilia"	4	"g"	4	"g"	""
@ -410,7 +410,7 @@
 "SLT3"		"Sulfamerazine/trimethoprim"	"Trimethoprims"	"J01EE07"	"Sulfonamides and trimethoprim"	"Combinations of sulfonamides and trimethoprim, incl. derivatives"	""	""					""
 "SUM"	5327	"Sulfamethazine"	"Other antibacterials"	"NA"			""	"azolmetazin,benzene sulfonamide,calfspan,calfspan tablets,cremomethazine,diazil,diazilsulfadine,dimezathine,intradine,kelametazine,mermeth,metazin,neasina,neazina,nsulfanilamide,panazin,pirmazin,primazin,sa iii,solfadimidina,spanbolet,sulfadimerazine,sulfadimesin,sulfadimesine,sulfadimethyldiazine,sulfadimezin,sulfadimezine,sulfadimezinum,sulfadimidin,sulfadimidina,sulfadimidine,sulfadimidinum,sulfadine,sulfametazina,sulfametazyny,sulfamethazine,sulfamethiazine,sulfamezathine,sulfamidine,sulfasure sr bolus,sulfodimesin,sulfodimezine,sulka k boluses,sulka s boluses,sulmet,sulphadimidine,sulphamethasine,sulphamethazine,sulphamezathine,sulphamidine,sulphodimezine,superseptil,superseptyl,vertolan"					"87592-2"
 "SLF4"	5328	"Sulfamethizole"	"Trimethoprims"	"B05CA04,D06BA04,J01EB02,S01AB01"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	"sfmz"	"ayerlucil,lucosil,methazol,microsul,nsulfanilamide,proklar,renasul,salimol,solfametizolo,sulamethizole,sulfa gram,sulfamethizol,sulfamethizole,sulfamethizolum,sulfametizol,sulfapyelon,sulfstat,sulfurine,sulphamethizole,tetracid,thidicur,thiosulfil,thiosulfil forte,ultrasul,urocydal,urodiaton,urolucosil,urosulfin"	4	"g"			"60175-7,60176-5,60177-3"
-"SMX"	5329	"Sulfamethoxazole"	"Trimethoprims"	"J01EC01"	"Sulfonamides and trimethoprim"	"Intermediate-acting sulfonamides"	"sfmx,sulf"	"azo gantanol,gamazole,gantanol,gantanol ds,metoxal,nsulfanilamide,nsulphanilamide,radonil,septran,simsinomin,sinomin,solfametossazolo,sulfamethalazole,sulfamethoxazol,sulfamethoxazole,sulfamethoxazolum,sulfamethoxizole,sulfamethylisoxazole,sulfametoxazol,sulfisomezole,sulmeprim,sulphamethalazole,sulphamethoxazol,sulphamethoxazole,sulphisomezole,urobak"	2	"g"			"10342-4,25271-8,39772-9,59971-2,59972-0,60333-2,72674-5,80549-9,80974-9"
+"SMX"	5329	"Sulfamethoxazole"	"Trimethoprims"	"J01EC01"	"Sulfonamides and trimethoprim"	"Intermediate-acting sulfonamides"	"sfmx,sulf"	"azo gantanol,gamazole,gantanol,gantanol ds,metoxal,nsulfanilamide,nsulphanilamide,radonil,septran,simsinomin,sinomin,solfametossazolo,sulfamethalazole,sulfamethoxazol,sulfamethoxazole,sulfamethoxazolum,sulfamethoxizole,sulfamethylisoxazole,sulfametoxazol,sulfisomezole,sulmeprim,sulphamethalazole,sulphamethoxazol,sulphamethoxazole,sulphisomezole,urobak"	2	"g"			"10342-4,11577-4,18985-2,25271-8,39772-9,467-1,468-9,469-7,470-5,59971-2,59972-0,60333-2,72674-5,80549-9,80974-9"
 "SLF5"	5330	"Sulfamethoxypyridazine"	"Trimethoprims"	"J01ED05"	"Sulfonamides and trimethoprim"	"Long-acting sulfonamides"	""	"altezol,davosin,depovernil,kineks,lederkyn,lentac,lisulfen,longin,medicel,midicel,midikel,myasul,nsulfanilamide,opinsul,paramid,paramid supra,petrisul,piridolo,quinoseptyl,retamid,retasulfin,retasulphine,slosul,spofadazine,sulfalex,sulfapyridazine,sulfdurazin,sulfozona,sultirene,vinces"	0.5	"g"			""
 "SLF6"	19596	"Sulfametomidine"	"Trimethoprims"	"J01ED03"	"Sulfonamides and trimethoprim"	"Long-acting sulfonamides"	""	"duroprocin,methofadin,methofazine,nsulfanilamide,solfametomidina,sulfamethomidine,sulfametomidin,sulfametomidina,sulfametomidine,sulfametomidinum"					""
 "SLF7"	5326	"Sulfametoxydiazine"	"Trimethoprims"	"J01ED04"	"Sulfonamides and trimethoprim"	"Long-acting sulfonamides"	""	"bayrena,berlicid,dairena,durenat,juvoxin,kinecid,kirocid,longasulf,methoxypyrimal,nsulfanilamide,solfametossidiazina,sulfameter,sulfamethorine,sulfamethoxine,sulfamethoxydiazin,sulfamethoxydiazine,sulfamethoxydin,sulfamethoxydine,sulfametin,sulfametinum,sulfametorin,sulfametorine,sulfametorinum,sulfametoxidiazina,sulfametoxidine,sulfametoxydiazine,sulfametoxydiazinum,sulphameter,sulphamethoxydiazine,supramid,ultrax"	0.5	"g"			""
@ -422,63 +422,63 @@
 "SLF11"	5335	"Sulfaphenazole"	"Trimethoprims"	"J01ED08"	"Sulfonamides and trimethoprim"	"Long-acting sulfonamides"	""	"depocid,depotsulfonamide,eftolon,firmazolo,inamil,isarol,isarol v,merian,microtan pirazolo,nsulfanilamide,orisul,orisulf,paidazolo,phenylsulfapyrazole,plisulfan,raziosulfa,solfafenazolo,sulfabid,sulfafenazol,sulfafenazolo,sulfaphenazol,sulfaphenazole,sulfaphenazolum,sulfaphenazon,sulfaphenylpipazol,sulfaphenylpyrazol,sulfaphenylpyrazole,sulfonylpyrazol,sulphaphenazole,sulphenazole"	1	"g"			""
 "SLF12"	5336	"Sulfapyridine"	"Trimethoprims"	"J01EB04"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	""	"adiplon,coccoclase,dagenan,eubasin,eubasinum,haptocil,piridazol,plurazol,pyriamid,pyridazol,relbapiridina,septipulmon,solfapiridina,streptosilpyridine,sulfapiridina,sulfapyridin,sulfapyridine,sulfapyridinum,sulfidin,sulfidine,sulphapyridin,sulphapyridine,thioseptal,trianon"	1	"g"			"14075-6,55580-5"
 "SNA"	60582	"Sulfasuccinamide"	"Other antibacterials"	"NA"			""	"ambesid,derganil,sulfasuccinamid,sulfasuccinamida,sulfasuccinamide,sulfasuccinamidum"					""
-"SUT"	5340	"Sulfathiazole"	"Trimethoprims"	"D06BA02,J01EB07"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	""	"azoquimiol,azoseptale,cerazol,cerazole,chemosept,cibazol,duatok,dulana,eleudron,enterobiocine,estafilol,formosulfathiazole,neostrepsan,norsulfasol,norsulfazol,norsulfazole,norsulfazolum,nsulfanilamide,planomide,poliseptil,sanotiazol,septozol,sodium sulfathiazole,solfatiazolo,streptosilthiazole,sulfamul,sulfathiazol,sulfathiazole,sulfathiazolum,sulfatiazol,sulfavitina,sulfocerol,sulphathiazole,sulzol,thiacoccine,thiasulfol,thiazamide,thiozamide,triple sulfa,wintrazole"					"87591-4"
+"SUT"	5340	"Sulfathiazole"	"Trimethoprims"	"D06BA02,J01EB07"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	""	"azoquimiol,azoseptale,cerazol,cerazole,chemosept,cibazol,duatok,dulana,eleudron,enterobiocine,estafilol,formosulfathiazole,neostrepsan,norsulfasol,norsulfazol,norsulfazole,norsulfazolum,nsulfanilamide,planomide,poliseptil,sanotiazol,septozol,sodium sulfathiazole,solfatiazolo,streptosilthiazole,sulfamul,sulfathiazol,sulfathiazole,sulfathiazolum,sulfatiazol,sulfavitina,sulfocerol,sulphathiazole,sulzol,thiacoccine,thiasulfol,thiazamide,thiozamide,triple sulfa,wintrazole"					"87591-4,87796-9,87797-7"
 "SLF13"	3000579	"Sulfathiourea"	"Trimethoprims"	"J01EB08"	"Sulfonamides and trimethoprim"	"Short-acting sulfonamides"	""	"badional,baldinol,fontamide,salvoseptyl,solfatiourea,solufontamide,sulfanilthiourea,sulfathiocarbamid,sulfathiocarbamide,sulfathiocarbamidum,sulfathiourea,sulfathiouree,sulfatiourea,sulphathiourea"	6	"g"			""
-"SOX"	5344	"Sulfisoxazole"	"Other antibacterials"	"NA"			""	"accuzole,alphazole,amidoxal,astrazolo,azo gantrisin,azosulfizin,bactesulf,barazae,chemouag,cosoxazole,dorsulfan,dorsulfan warthausen,entusil,entusul,eryzole,gantrisin,gantrisine,gantrisona,gantrizin,gantrosan,isoxamin,neazolin,neoxazoi,neoxazol,novazolo,novosaxazole,nsulfanilamide,nsulphanilamide,pancid,pediazole,renosulfan,resoxol,roxosul,roxosul tablets,roxoxol,saxosozine,sodizole,solfafurazolo,soxamide,soxazole,soxisol,soxitabs,soxomide,stansin,sulbio,sulfafuraz ole,sulfafurazol,sulfafurazole,sulfafurazolum,sulfagan,sulfagen,sulfaisoxazole,sulfalar,sulfapolar,sulfasol,sulfasoxazole,sulfasoxizole,sulfazin,sulfisin,sulfisonazole,sulfisoxasole,sulfisoxazol,sulfisoxazole,sulfisoxazolum,sulfizin,sulfizol,sulfizole,sulfofurazole,sulfoxol,suloxsol,sulphafuraz,sulphafurazol,sulphafurazole,sulphafurazolum,sulphaisoxazole,sulphisoxazol,sulphisoxazole,sulphofurazole,sulsoxin,thiasin,unisulf,urisoxin,uritrisin,urogan,vagilia"					"9701-4"
-"SSS"	86225	"Sulfonamide"	"Other antibacterials"	"NA"			"sfna"	"anhydron,aquirel,ciclotiazida,ciclotiazide,cyclothiazide,cyclothiazidum,doburil,fluidil,renazide,valmiran"					""
-"SLP"	9950244	"Sulopenem"	"Other antibacterials"	"NA"			""	"sulopenem"					""
+"SOX"	5344	"Sulfisoxazole"	"Other antibacterials"	"NA"			""	"accuzole,alphazole,amidoxal,astrazolo,azo gantrisin,azosulfizin,bactesulf,barazae,chemouag,cosoxazole,dorsulfan,dorsulfan warthausen,entusil,entusul,eryzole,gantrisin,gantrisine,gantrisona,gantrizin,gantrosan,isoxamin,neazolin,neoxazoi,neoxazol,novazolo,novosaxazole,nsulfanilamide,nsulphanilamide,pancid,pediazole,renosulfan,resoxol,roxosul,roxosul tablets,roxoxol,saxosozine,sodizole,solfafurazolo,soxamide,soxazole,soxisol,soxitabs,soxomide,stansin,sulbio,sulfafuraz ole,sulfafurazol,sulfafurazole,sulfafurazolum,sulfagan,sulfagen,sulfaisoxazole,sulfalar,sulfapolar,sulfasol,sulfasoxazole,sulfasoxizole,sulfazin,sulfisin,sulfisonazole,sulfisoxasole,sulfisoxazol,sulfisoxazole,sulfisoxazolum,sulfizin,sulfizol,sulfizole,sulfofurazole,sulfoxol,suloxsol,sulphafuraz,sulphafurazol,sulphafurazole,sulphafurazolum,sulphaisoxazole,sulphisoxazol,sulphisoxazole,sulphofurazole,sulsoxin,thiasin,unisulf,urisoxin,uritrisin,urogan,vagilia"					"11578-2,18986-0,25226-2,471-3,472-1,473-9,474-7,9701-4"
+"SSS"	86225	"Sulfonamide"	"Other antibacterials"	"NA"			"sfna"	"anhydron,aquirel,ciclotiazida,ciclotiazide,cyclothiazide,cyclothiazidum,doburil,fluidil,renazide,valmiran"					"17674-3,17675-0,18987-8,35842-4,4040-2,4041-0,4042-8,475-4,476-2,477-0,478-8,75650-2"
+"SLP"	9950244	"Sulopenem"	"Other antibacterials"	"NA"			""	"sulopenem"					"55289-3,55290-1,55291-9"
 "SLT6"	444022	"Sultamicillin"	"Beta-lactams/penicillins"	"J01CR04"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	""	"sultamicilina,sultamicillin,sultamicillinum"	1.5	"g"			""
 "SUR"	46700778	"Surotomycin"	"Other antibacterials"	"NA"			""	"surotomycin"					""
-"TAL"	71447	"Talampicillin"	"Beta-lactams/penicillins"	"J01CA15"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"talampicilina,talampicillin,talampicilline,talampicillinum"	2	"g"			""
+"TAL"	71447	"Talampicillin"	"Beta-lactams/penicillins"	"J01CA15"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	""	"talampicilina,talampicillin,talampicilline,talampicillinum"	2	"g"			"18988-6,479-6,480-4,481-2,482-0"
 "TLP"	163307	"Talmetoprim"	"Other antibacterials"	"NA"			""	"talmetoprim"					""
-"TAZ"	123630	"Tazobactam"	"Beta-lactams/penicillins"	"J01CG02"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase inhibitors"	"tazo"	"tazobactam,tazobactam acid,tazobactamum,tazobactum"					""
+"TAZ"	123630	"Tazobactam"	"Beta-lactams/penicillins"	"J01CG02"	"Beta-lactam antibacterials, penicillins"	"Beta-lactamase inhibitors"	"tazo"	"tazobactam,tazobactam acid,tazobactamum,tazobactum"					"41719-6,41720-4,41721-2,41740-2"
 "TBP"	9800194	"Tebipenem"	"Carbapenems"	"NA,J01DH06"			""	"tebipenem pivoxil"					""
-"TZD"	11234049	"Tedizolid"	"Oxazolidinones"	"J01XX11"	"Other antibacterials"	"Other antibacterials"	"tedi"	"sivextro,tedizolid,torezolid"	0.2	"g"	0.2	"g"	""
-"TEC"	16131923	"Teicoplanin"	"Glycopeptides"	"J01XA02"	"Other antibacterials"	"Glycopeptide antibacterials"	"tec,tei,teic,tp,tpl,tpn"	"targocid,tecoplanina,tecoplanine,tecoplaninum,teichomycin,teicoplanin,teicoplanina,teicoplanine,teicoplaninum"			0.4	"g"	"25534-9,25535-6,34378-0,34379-8,4043-6,80968-1"
+"TZD"	11234049	"Tedizolid"	"Oxazolidinones"	"J01XX11"	"Other antibacterials"	"Other antibacterials"	"tedi"	"sivextro,tedizolid,torezolid"	0.2	"g"	0.2	"g"	"73586-0,73608-2,73631-4"
+"TEC"	16131923	"Teicoplanin"	"Glycopeptides"	"J01XA02"	"Other antibacterials"	"Glycopeptide antibacterials"	"tec,tei,teic,tp,tpl,tpn"	"targocid,tecoplanina,tecoplanine,tecoplaninum,teichomycin,teicoplanin,teicoplanina,teicoplanine,teicoplaninum"			0.4	"g"	"18989-4,25534-9,25535-6,34378-0,34379-8,4043-6,483-8,484-6,485-3,486-1,7051-6,80968-1"
 "TCM"		"Teicoplanin-macromethod"	"Glycopeptides"	"NA"			""	""					""
-"TLV"	3081362	"Telavancin"	"Glycopeptides"	"J01XA03"	"Other antibacterials"	"Glycopeptide antibacterials"	"tela"	"telavancin,televancin,vibativ"					""
-"TLT"	3002190	"Telithromycin"	"Macrolides/lincosamides"	"J01FA15"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"teli"	"levviax,telithromycin"	0.8	"g"			""
-"TMX"	60021	"Temafloxacin"	"Quinolones"	"J01MA05"	"Quinolone antibacterials"	"Fluoroquinolones"	"tema"	"omniflox,temafloxacin,temafloxacina,temafloxacine,temafloxacinum"	0.8	"g"			""
-"TEM"	171758	"Temocillin"	"Beta-lactams/penicillins"	"J01CA17"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"temo"	"negaban,temocilina,temocillin,temocillina,temocilline,temocillinum"			4	"g"	""
-"TRB"	1549008	"Terbinafine"	"Antifungals/antimycotics"	"D01AE15,D01BA02"	"Antifungals for systemic use"	"Antifungals for systemic use"	"terb"	"corbinal,lamasil,lamisil,lamisil at,lamisil tablet,terbinafina,terbinafine,terbinafinum,terbinex"	0.25	"g"			""
-"TRC"	441383	"Terconazole"	"Antifungals/antimycotics"	"G01AG02"			""	"fungistat,panlomyc,terazol,terconazol,terconazole,terconazolum,tercospor,triaconazole,zazole"					""
+"TLV"	3081362	"Telavancin"	"Glycopeptides"	"J01XA03"	"Other antibacterials"	"Glycopeptide antibacterials"	"tela"	"telavancin,televancin,vibativ"					"72894-9,73630-6,85051-1,88886-7"
+"TLT"	3002190	"Telithromycin"	"Macrolides/lincosamides"	"J01FA15"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	"teli"	"levviax,telithromycin"	0.8	"g"			"35843-2,35844-0,35845-7,41722-0"
+"TMX"	60021	"Temafloxacin"	"Quinolones"	"J01MA05"	"Quinolone antibacterials"	"Fluoroquinolones"	"tema"	"omniflox,temafloxacin,temafloxacina,temafloxacine,temafloxacinum"	0.8	"g"			"18990-2,487-9,488-7,489-5,490-3"
+"TEM"	171758	"Temocillin"	"Beta-lactams/penicillins"	"J01CA17"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"temo"	"negaban,temocilina,temocillin,temocillina,temocilline,temocillinum"			4	"g"	"18991-0,491-1,492-9,493-7,494-5,54190-4"
+"TRB"	1549008	"Terbinafine"	"Antifungals/antimycotics"	"D01AE15,D01BA02"	"Antifungals for systemic use"	"Antifungals for systemic use"	"terb"	"corbinal,lamasil,lamisil,lamisil at,lamisil tablet,terbinafina,terbinafine,terbinafinum,terbinex"	0.25	"g"			"10720-1,10721-9,18992-8"
+"TRC"	441383	"Terconazole"	"Antifungals/antimycotics"	"G01AG02"			""	"fungistat,panlomyc,terazol,terconazol,terconazole,terconazolum,tercospor,triaconazole,zazole"					"55196-0"
 "TRZ"	65720	"Terizidone"	"Antimycobacterials"	"J04AK03"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	""	"terivalidin,terizidon,terizidona,terizidone,terizidonum"					""
-"TCY"	54675776	"Tetracycline"	"Tetracyclines"	"A01AB13,D06AA04,J01AA07,S01AA09,S02AA08,S03AA02"	"Tetracyclines"	"Tetracyclines"	"tc,te,tet,tetr"	"abramycin,abricycline,achromycin,achromycin v,actisite,agromicina,ambramicina,ambramycin,amycin,biocycline,bristaciclin,bristaciclina,bristacycline,brodspec,cefracycline,centet,ciclibion,copharlan,criseociclina,cyclomycin,cyclopar,cytome,democracin,deschlorobiomycin,dumocyclin,economycin,enterocycline,hostacyclin,lexacycline,limecycline,liquamycin,medocycline,mericycline,micycline,neocycline,oletetrin,omegamycin,orlycycline,panmycin,piracaps,polycycline,polyotic,purocyclina,resteclin,robitet,roviciclina,sigmamycin,solvocin,sumycin,sumycin syrup,supramycin,sustamycin,tetrabid organon,tetrabon,tetrachel,tetraciclina,tetracycl,tetracyclin,tetracycline,tetracycline base,tetracycline i,tetracycline ii,tetracyclinehydrate,tetracyclinum,tetracyn,tetradecin,tetrafil,tetramed,tetrasure,tetraverine,tetrazyklin,tetrex,topicycline,tsiklomistsin,tsiklomitsin,veracin,vetacyclinum,vetquamycin"	1	"g"	1	"g"	"25272-6,4045-1,87590-6"
+"TCY"	54675776	"Tetracycline"	"Tetracyclines"	"A01AB13,D06AA04,J01AA07,S01AA09,S02AA08,S03AA02"	"Tetracyclines"	"Tetracyclines"	"tc,te,tet,tetr"	"abramycin,abricycline,achromycin,achromycin v,actisite,agromicina,ambramicina,ambramycin,amycin,biocycline,bristaciclin,bristaciclina,bristacycline,brodspec,cefracycline,centet,ciclibion,copharlan,criseociclina,cyclomycin,cyclopar,cytome,democracin,deschlorobiomycin,dumocyclin,economycin,enterocycline,hostacyclin,lexacycline,limecycline,liquamycin,medocycline,mericycline,micycline,neocycline,oletetrin,omegamycin,orlycycline,panmycin,piracaps,polycycline,polyotic,purocyclina,resteclin,robitet,roviciclina,sigmamycin,solvocin,sumycin,sumycin syrup,supramycin,sustamycin,tetrabid organon,tetrabon,tetrachel,tetraciclina,tetracycl,tetracyclin,tetracycline,tetracycline base,tetracycline i,tetracycline ii,tetracyclinehydrate,tetracyclinum,tetracyn,tetradecin,tetrafil,tetramed,tetrasure,tetraverine,tetrazyklin,tetrex,topicycline,tsiklomistsin,tsiklomitsin,veracin,vetacyclinum,vetquamycin"	1	"g"	1	"g"	"101504-9,18993-6,25272-6,4045-1,495-2,496-0,497-8,498-6,7052-4,87590-6"
 "TOL"	54691494	"Tetracycline/oleandomycin"	"Other antibacterials"	"J01RA08"	"Combinations of antibacterials"	"Combinations of antibacterials"	""	""					""
 "TET"	65450	"Tetroxoprim"	"Other antibacterials"	"NA"			""	"tetroxoprim,tetroxoprima,tetroxoprime,tetroxoprimum"					""
-"THA"	9568512	"Thiacetazone"	"Oxazolidinones"	"NA"			""	"aktivan,ambathizon,amithiozone,amithizone,amitiozon,benthiozone,benzothiozane,benzothiozon,berculon a,berkazon,citazone,conteben,diasan,diazan,domakol,ilbion,livazone,mirizone neustab,mivizon,myvizone,neotibil,neustab,novakol,nuclon argentinian,panrone,parazone,seroden,siocarbazone,tebalon,tebecure,tebemar,tebesone i,tebethion,tebethione,tebezon,thiacetazone,thiacetone,thiacetozone,thibon,thibone,thioacetazon,thioacetazone,thioacetazonum,thioazetazone,thiocarbazil,thiomicid,thionicid,thioparamizon,thioparamizone,thiosemicarbarzone,thiosemicarbazone,thiotebesin,thiotebezin,thiotebicina,thizone,tiacetazon,tibicur,tibion,tibione,tibizan,tibone,tioacetazon,tioacetazona,tioatsetazon,tiobicina,tiocarone,tiosecolo,tubercazon,tubigal"					""
-"THI"	27200	"Thiamphenicol"	"Amphenicols"	"J01BA02"	"Amphenicols"	"Amphenicols"	""	"descocin,dexawin,dextrosulfenidol,dextrosulphenidol,efnicol,hyrazin,igralin,macphenicol,masatirin,neomyson,racefenicol,racefenicolo,racefenicolum,raceophenidol,racephenicol,rincrol,thiamcol,thiamphenicol,thiamphenicolum,thiocymetin,thiomycetin,thiophenicol,tiamfenicol,tiamfenicolo,urfamicina,urfamycine,vicemycetin"	1.5	"g"	1.5	"g"	""
+"THA"	9568512	"Thiacetazone"	"Oxazolidinones"	"NA"			""	"aktivan,ambathizon,amithiozone,amithizone,amitiozon,benthiozone,benzothiozane,benzothiozon,berculon a,berkazon,citazone,conteben,diasan,diazan,domakol,ilbion,livazone,mirizone neustab,mivizon,myvizone,neotibil,neustab,novakol,nuclon argentinian,panrone,parazone,seroden,siocarbazone,tebalon,tebecure,tebemar,tebesone i,tebethion,tebethione,tebezon,thiacetazone,thiacetone,thiacetozone,thibon,thibone,thioacetazon,thioacetazone,thioacetazonum,thioazetazone,thiocarbazil,thiomicid,thionicid,thioparamizon,thioparamizone,thiosemicarbarzone,thiosemicarbazone,thiotebesin,thiotebezin,thiotebicina,thizone,tiacetazon,tibicur,tibion,tibione,tibizan,tibone,tioacetazon,tioacetazona,tioatsetazon,tiobicina,tiocarone,tiosecolo,tubercazon,tubigal"					"32384-0,54184-7,54204-3"
+"THI"	27200	"Thiamphenicol"	"Amphenicols"	"J01BA02"	"Amphenicols"	"Amphenicols"	""	"descocin,dexawin,dextrosulfenidol,dextrosulphenidol,efnicol,hyrazin,igralin,macphenicol,masatirin,neomyson,racefenicol,racefenicolo,racefenicolum,raceophenidol,racephenicol,rincrol,thiamcol,thiamphenicol,thiamphenicolum,thiocymetin,thiomycetin,thiophenicol,tiamfenicol,tiamfenicolo,urfamicina,urfamycine,vicemycetin"	1.5	"g"	1.5	"g"	"41723-8,41724-6,41725-3,54169-8"
 "TAT"	9568512	"Thioacetazone"	"Antimycobacterials"	"J04AK07"	"Drugs for treatment of tuberculosis"	"Other drugs for treatment of tuberculosis"	""	"aktivan,ambathizon,amithiozone,amitiozon,benthiozone,benzothiozane,benzothiozon,berculon a,berkazon,citazone,conteben,diasan,domakol,ilbion,livazone,mirizone neustab,mivizon,myvizone,neotibil,neustab,novakol,nuclon argentinian,panrone,parazone,seroden,siocarbazone,tebalon,tebecure,tebemar,tebesone i,tebethion,tebethione,tebezon,thiacetone,thiacetozone,thibon,thibone,thioacetazon,thioacetazone,thioacetazonum,thioazetazone,thiocarbazil,thiomicid,thionicid,thioparamizon,thioparamizone,thiosemicarbarzone,thiosemicarbazone,thiotebesin,thiotebezin,thiotebicina,thizone,tiacetazon,tibicur,tibion,tibione,tibizan,tibone,tioacetazon,tioacetazona,tioatsetazon,tiobicina,tiocarone,tiosecolo,tubercazon,tubigal"					""
 "THI1"		"Thioacetazone/isoniazid"	"Antimycobacterials"	"J04AM04"	"Drugs for treatment of tuberculosis"	"Combinations of drugs for treatment of tuberculosis"	""	""					""
-"TIA"	656958	"Tiamulin"	"Other antibacterials"	"NA"			""	"denagard,thiamutilin,tiamulin,tiamulin pamoate,tiamulina,tiamuline,tiamulinum,tiavet p"					"87589-8"
-"TIC"	36921	"Ticarcillin"	"Beta-lactams/penicillins"	"J01CA13"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"tc,ti,tic,tica"	"ticarcilina,ticarcillin,ticarcilline,ticarcillinum,ticillin,timentin"			15	"g"	"25254-4,4054-3,4055-0"
+"TIA"	656958	"Tiamulin"	"Other antibacterials"	"NA"			""	"denagard,thiamutilin,tiamulin,tiamulin pamoate,tiamulina,tiamuline,tiamulinum,tiavet p"					"35846-5,35847-3,35848-1,87589-8"
+"TIC"	36921	"Ticarcillin"	"Beta-lactams/penicillins"	"J01CA13"	"Beta-lactam antibacterials, penicillins"	"Penicillins with extended spectrum"	"tc,ti,tic,tica"	"ticarcilina,ticarcillin,ticarcilline,ticarcillinum,ticillin,timentin"			15	"g"	"18994-4,18995-1,25254-4,4054-3,4055-0,499-4,500-9,501-7,502-5,503-3,504-1,505-8,506-6,55716-5,55717-3,55718-1,55719-9,7053-2,7054-0"
 "TCC"	6437075	"Ticarcillin/clavulanic acid"	"Beta-lactams/penicillins"	"J01CR03"	"Beta-lactam antibacterials, penicillins"	"Combinations of penicillins, incl. beta-lactamase inhibitors"	"t/c,tcc,ticl,tim,tlc"	"timentin"			15	"g"	""
-"TGC"	54686904	"Tigecycline"	"Tetracyclines"	"J01AA12"	"Tetracyclines"	"Tetracyclines"	"tgc,tig,tige"	"haizheng li xing,tigeciclina,tigecyclin,tigecycline,tigecycline hydrate,tigecyclinum,tigilcycline,tygacil"			0.1	"g"	""
+"TGC"	54686904	"Tigecycline"	"Tetracyclines"	"J01AA12"	"Tetracyclines"	"Tetracyclines"	"tgc,tig,tige"	"haizheng li xing,tigeciclina,tigecyclin,tigecycline,tigecycline hydrate,tigecyclinum,tigilcycline,tygacil"			0.1	"g"	"101499-2,42354-1,42355-8,42356-6,42357-4,55158-0"
 "TBQ"	65592	"Tilbroquinol"	"Quinolones"	"P01AA05"			""	"tilbroquinol,tilbroquinolum"					""
-"TIP"	24860548	"Tildipirosin"	"Macrolides/lincosamides"	"NA"			""	"tildipirosin,zuprevo"					""
-"TIL"	5282521	"Tilmicosin"	"Macrolides/lincosamides"	"NA"			""	"micotil,pulmotil,tilmicosin,tilmicosina,tilmicosine,tilmicosinum"					"87588-0"
-"TIN"	5479	"Tinidazole"	"Other antibacterials"	"J01XD02,P01AB02"	"Other antibacterials"	"Imidazole derivatives"	"tini"	"amtiba,bioshik,ethyl sulfone,fasigin,fasigyn,fasigyntrade mark,fasygin,glongyn,haisigyn,pletil,simplotan,simplotantrade mark,sorquetan,symplotan,tindamax,tindamaxtrade mark,tinidazol,tinidazole,tinidazolum,tricolam,trimonase"	2	"g"	1.5	"g"	""
+"TIP"	24860548	"Tildipirosin"	"Macrolides/lincosamides"	"NA"			""	"tildipirosin,zuprevo"					"100060-3,88375-1,88377-7"
+"TIL"	5282521	"Tilmicosin"	"Macrolides/lincosamides"	"NA"			""	"micotil,pulmotil,tilmicosin,tilmicosina,tilmicosine,tilmicosinum"					"35849-9,35850-7,35851-5,87588-0"
+"TIN"	5479	"Tinidazole"	"Other antibacterials"	"J01XD02,P01AB02"	"Other antibacterials"	"Imidazole derivatives"	"tini"	"amtiba,bioshik,ethyl sulfone,fasigin,fasigyn,fasigyntrade mark,fasygin,glongyn,haisigyn,pletil,simplotan,simplotantrade mark,sorquetan,symplotan,tindamax,tindamaxtrade mark,tinidazol,tinidazole,tinidazolum,tricolam,trimonase"	2	"g"	1.5	"g"	"54928-7,55720-7,55721-5,55722-3"
 "TCR"	3001386	"Tiocarlide"	"Antimycobacterials"	"J04AD02"	"Drugs for treatment of tuberculosis"	"Thiocarbamide derivatives"	""	"amixyl,datanil,disocarban,disoxyl,isoxyl,thiocarlide,tiocarlid,tiocarlida,tiocarlide,tiocarlidum"	7	"g"			""
 "TDC"	10247721	"Tiodonium chloride"	"Other antibacterials"	"NA"			""	"cloruro de tiodonio,tiodonii chloridum,tiodonium chloride"					""
 "TXC"	65788	"Tioxacin"	"Quinolones"	"NA"			""	"tioxacin,tioxacine,tioxacino,tioxacinum,tioxic acid"					""
-"TIZ"	394397	"Tizoxanide"	"Other antibacterials"	"NA"			""	"ntzdes"					""
-"TOB"	36294	"Tobramycin"	"Aminoglycosides"	"J01GB01,S01AA12"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"nn,tm,to,tob,tobr"	"bethkis,brulamycin,deoxykanamycin b,distobram,gernebcin,gotabiotic,kitabis,kitabis pak,nebcin,nebicin,nebramycin,nebramycin vi,obramycin,sybryx,tenebrimycin,tenemycin,tobacin,tobi podhaler,tobracin,tobradex,tobradistin,tobralex,tobramaxin,tobramicin,tobramicina,tobramitsetin,tobramycetin,tobramycin,tobramycin base,tobramycin sulfate,tobramycine,tobramycinum,tobrased,tobrasone,tobrex"			0.24	"g"	"13584-8,17808-7,22750-4,22751-2,22752-0,31094-6,31095-3,31096-1,35239-3,35670-9,4057-6,4058-4,4059-2,50927-3,52962-8,59380-6,80966-5"
+"TIZ"	394397	"Tizoxanide"	"Other antibacterials"	"NA"			""	"ntzdes"					"73585-2,73607-4,73629-8"
+"TOB"	36294	"Tobramycin"	"Aminoglycosides"	"J01GB01,S01AA12"	"Aminoglycoside antibacterials"	"Other aminoglycosides"	"nn,tm,to,tob,tobr"	"bethkis,brulamycin,deoxykanamycin b,distobram,gernebcin,gotabiotic,kitabis,kitabis pak,nebcin,nebicin,nebramycin,nebramycin vi,obramycin,sybryx,tenebrimycin,tenemycin,tobacin,tobi podhaler,tobracin,tobradex,tobradistin,tobralex,tobramaxin,tobramicin,tobramicina,tobramitsetin,tobramycetin,tobramycin,tobramycin base,tobramycin sulfate,tobramycine,tobramycinum,tobrased,tobrasone,tobrex"			0.24	"g"	"101496-8,13584-8,17808-7,18996-9,22750-4,22751-2,22752-0,25227-0,25800-4,31094-6,31095-3,31096-1,35239-3,35670-9,4057-6,4058-4,4059-2,507-4,508-2,509-0,50927-3,510-8,52962-8,59380-6,7055-7,80966-5"
 "TOH"		"Tobramycin-high"	"Aminoglycosides"	"NA"			"tobra high,tobramycin high,tohl"	""					""
-"TFX"	5517	"Tosufloxacin"	"Quinolones"	"J01MA22"			""	"tosufloxacin"	0.45	"g"			""
-"TMP"	5578	"Trimethoprim"	"Trimethoprims"	"J01EA01"	"Sulfonamides and trimethoprim"	"Trimethoprim and derivatives"	"t,tmp,tr,tri,trim,w"	"abaprim,alprim,anitrim,antrima,antrimox,bacdan,bacidal,bacide,bacterial,bacticel,bactifor,bactin,bactoprim,bactramin,bactrim,bencole,bethaprim,biosulten,briscotrim,chemotrin,colizole,colizole ds,conprim,cotrimel,cotrimoxizole,deprim,dosulfin,duocide,esbesul,espectrin,euctrim,exbesul,fermagex,fortrim,idotrim,ikaprim,infectotrimet,instalac,kombinax,lagatrim,lagatrim forte,lastrim,lescot,methoprim,metoprim,monoprim,monotrim,monotrimin,novotrimel,omstat,oraprim,pancidim,polytrim,priloprim,primosept,primsol,proloprim,protrin,purbal,resprim,resprim forte,roubac,roubal,salvatrim,septrin ds,septrin forte,septrin s,setprin,sinotrim,stopan,streptoplus,sugaprim,sulfamar,sulfamethoprim,sulfoxaprim,sulthrim,sultrex,syraprim,tiempe,tmp smx,toprim,trimanyl,trimethioprim,trimethopim,trimethoprim,trimethoprime,trimethoprimum,trimethopriom,trimetoprim,trimetoprima,trimexazole,trimexol,trimezol,trimogal,trimono,trimopan,trimpex,triprim,trisul,trisulcom,trisulfam,trisural,uretrim,urobactrim,utetrin,velaten,wellcoprim,wellcoprin,xeroprim,zamboprim"	0.4	"g"	0.4	"g"	"11005-6,17747-7,25273-4,32342-8,4079-0,4080-8,4081-6,55584-7,80552-3,80973-1"
-"SXT"	358641	"Trimethoprim/sulfamethoxazole"	"Trimethoprims"	"J01EE01"	"Sulfonamides and trimethoprim"	"Combinations of sulfonamides and trimethoprim, incl. derivatives"	"cot,cotrim,sxt,t/s,trsu,trsx,ts"	"abacin,abactrim,agoprim,alfatrim,aposulfatrim,bacteral,bacterial forte,bactilen,bactiver,bacton,bactoreduct,bactrim,bactrim ds,bactrim forte,bactrim pediatric,bactrimel,bactrizol,bactromin,bactropin,baktar,belcomycine,berlocid,bibacrim,biseptol,chemitrim,chemotrim,ciplin,colimycin,colimycin sulphate,colisticin,colistimethate,colistimethate sodium,colistin sulfate,colistin sulphate,colomycin,coly-mycin,cotribene,cotrim d.s.,cotrim eu rho,cotrim holsen,cotrim.l.u.t.,cotrimaxazol,cotrimazole,cotrimhexal,cotrimoxazol,cotrimoxazol al,cotrimoxazole,cotrimstada,cotriver,dibaprim,drylin,duratrimet,eltrianyl,escoprim,esteprim,eusaprim,fectrim,gantaprim,gantaprin,gantrim,groprim,helveprim,imexim,jenamoxazol,kemoprim,kepinol,kepinol forte,laratrim,linaris,maxtrim,microtrim,microtrim forte,mikrosid,momentol,oecotrim,oriprim,oxaprim,pantoprim,polymyxin e,polymyxin e. sulfate,primazole,promixin,septra,septra ds,septra grape,septrim,septrin,servitrim,sigaprim,sigaprin,sulfatrim pediatric,sulfotrim,sulfotrimin,sulmeprim pediatric,sulprim,sumetrolim,supracombin,suprim,tacumil,teleprim,teleprin,thiocuran,totazina,tribakin,trifen,trigonyl,trimesulf,trimetho comp,trimethoprimsulfa,trimetoger,trimexazol,trimforte,trimosulfa,uroplus,uroplus ds,uroplus ss"					""
-"TRL"	202225	"Troleandomycin"	"Macrolides/lincosamides"	"J01FA08"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"acetyloleandomycin,aovine,cyclamycin,evramicina,matromicina,matromycin t,micotil,oleandocetine,oleandomycin,t.a.o.,treolmicina,tribiocillina,triocetin,triolan,troleandomicina,troleandomycin,troleandomycine,troleandomycinum,viamicina,wytrion"	1	"g"			""
+"TFX"	5517	"Tosufloxacin"	"Quinolones"	"J01MA22"			""	"tosufloxacin"	0.45	"g"			"100061-1,76146-0"
+"TMP"	5578	"Trimethoprim"	"Trimethoprims"	"J01EA01"	"Sulfonamides and trimethoprim"	"Trimethoprim and derivatives"	"t,tmp,tr,tri,trim,w"	"abaprim,alprim,anitrim,antrima,antrimox,bacdan,bacidal,bacide,bacterial,bacticel,bactifor,bactin,bactoprim,bactramin,bactrim,bencole,bethaprim,biosulten,briscotrim,chemotrin,colizole,colizole ds,conprim,cotrimel,cotrimoxizole,deprim,dosulfin,duocide,esbesul,espectrin,euctrim,exbesul,fermagex,fortrim,idotrim,ikaprim,infectotrimet,instalac,kombinax,lagatrim,lagatrim forte,lastrim,lescot,methoprim,metoprim,monoprim,monotrim,monotrimin,novotrimel,omstat,oraprim,pancidim,polytrim,priloprim,primosept,primsol,proloprim,protrin,purbal,resprim,resprim forte,roubac,roubal,salvatrim,septrin ds,septrin forte,septrin s,setprin,sinotrim,stopan,streptoplus,sugaprim,sulfamar,sulfamethoprim,sulfoxaprim,sulthrim,sultrex,syraprim,tiempe,tmp smx,toprim,trimanyl,trimethioprim,trimethopim,trimethoprim,trimethoprime,trimethoprimum,trimethopriom,trimetoprim,trimetoprima,trimexazole,trimexol,trimezol,trimogal,trimono,trimopan,trimpex,triprim,trisul,trisulcom,trisulfam,trisural,uretrim,urobactrim,utetrin,velaten,wellcoprim,wellcoprin,xeroprim,zamboprim"	0.4	"g"	0.4	"g"	"101495-0,11005-6,17747-7,18997-7,18998-5,20387-7,23614-1,23631-5,25273-4,32342-8,4079-0,4080-8,4081-6,511-6,512-4,513-2,514-0,515-7,516-5,517-3,518-1,55584-7,7056-5,7057-3,80552-3,80973-1"
+"SXT"	358641	"Trimethoprim/sulfamethoxazole"	"Trimethoprims"	"J01EE01"	"Sulfonamides and trimethoprim"	"Combinations of sulfonamides and trimethoprim, incl. derivatives"	"cot,cotrim,sxt,t/s,trsu,trsx,ts"	"abacin,abactrim,agoprim,alfatrim,aposulfatrim,bacteral,bacterial forte,bactilen,bactiver,bacton,bactoreduct,bactrim,bactrim ds,bactrim forte,bactrim pediatric,bactrimel,bactrizol,bactromin,bactropin,baktar,belcomycine,berlocid,bibacrim,biseptol,chemitrim,chemotrim,ciplin,colimycin,colimycin sulphate,colisticin,colistimethate,colistimethate sodium,colistin sulfate,colistin sulphate,colomycin,coly-mycin,cotribene,cotrim d.s.,cotrim eu rho,cotrim holsen,cotrim.l.u.t.,cotrimaxazol,cotrimazole,cotrimhexal,cotrimoxazol,cotrimoxazol al,cotrimoxazole,cotrimstada,cotriver,dibaprim,drylin,duratrimet,eltrianyl,escoprim,esteprim,eusaprim,fectrim,gantaprim,gantaprin,gantrim,groprim,helveprim,imexim,jenamoxazol,kemoprim,kepinol,kepinol forte,laratrim,linaris,maxtrim,microtrim,microtrim forte,mikrosid,momentol,oecotrim,oriprim,oxaprim,pantoprim,polymyxin e,polymyxin e. sulfate,primazole,promixin,septra,septra ds,septra grape,septrim,septrin,servitrim,sigaprim,sigaprin,sulfatrim pediatric,sulfotrim,sulfotrimin,sulmeprim pediatric,sulprim,sumetrolim,supracombin,suprim,tacumil,teleprim,teleprin,thiocuran,totazina,tribakin,trifen,trigonyl,trimesulf,trimetho comp,trimethoprimsulfa,trimetoger,trimexazol,trimforte,trimosulfa,uroplus,uroplus ds,uroplus ss"					"101495-0,18998-5,20387-7,23631-5,25273-4,32342-8,4081-6,515-7,516-5,517-3,518-1,7057-3"
+"TRL"	202225	"Troleandomycin"	"Macrolides/lincosamides"	"J01FA08"	"Macrolides, lincosamides and streptogramins"	"Macrolides"	""	"acetyloleandomycin,aovine,cyclamycin,evramicina,matromicina,matromycin t,micotil,oleandocetine,oleandomycin,t.a.o.,treolmicina,tribiocillina,triocetin,triolan,troleandomicina,troleandomycin,troleandomycine,troleandomycinum,viamicina,wytrion"	1	"g"			"18999-3,519-9,520-7,521-5,522-3"
 "TRO"	55886	"Trospectomycin"	"Other antibacterials"	"NA"			""	"rubidiumnitrate,trospectinomycin,trospectomicina,trospectomycin,trospectomycine,trospectomycinum"					""
-"TVA"	62959	"Trovafloxacin"	"Quinolones"	"J01MA13"	"Quinolone antibacterials"	"Fluoroquinolones"	"trov"	"trovafloxacin,trovan"	0.2	"g"	0.2	"g"	""
-"TUL"	9832301	"Tulathromycin"	"Macrolides/lincosamides"	"NA"			""	"draxxin,tulathrmycin a,tulathromycin,tulathromycin a"					""
-"TYL"	5280440	"Tylosin"	"Macrolides/lincosamides"	"NA"			""	"fradizine,tilosina,tylocine,tylosin,tylosin a,tylosine,tylosinum"					"87587-2"
-"TYL1"	6441094	"Tylvalosin"	"Macrolides/lincosamides"	"NA"			"tvn"	"tylvalosin"					""
+"TVA"	62959	"Trovafloxacin"	"Quinolones"	"J01MA13"	"Quinolone antibacterials"	"Fluoroquinolones"	"trov"	"trovafloxacin,trovan"	0.2	"g"	0.2	"g"	"23642-2,23643-0,35855-6,7058-1"
+"TUL"	9832301	"Tulathromycin"	"Macrolides/lincosamides"	"NA"			""	"draxxin,tulathrmycin a,tulathromycin,tulathromycin a"					"76149-4,87798-5"
+"TYL"	5280440	"Tylosin"	"Macrolides/lincosamides"	"NA"			""	"fradizine,tilosina,tylocine,tylosin,tylosin a,tylosine,tylosinum"					"35856-4,35857-2,35858-0,87587-2"
+"TYL1"	6441094	"Tylvalosin"	"Macrolides/lincosamides"	"NA"			"tvn"	"tylvalosin"					"101526-2,87586-4"
 "PRU1"	124225	"Ulifloxacin (Prulifloxacin)"	"Other antibacterials"	"NA"			""	"ulifloxacin"					""
-"VAN"	14969	"Vancomycin"	"Glycopeptides"	"A07AA09,J01XA01,S01AA28"	"Other antibacterials"	"Glycopeptide antibacterials"	"va,van,vanc"	"vancocin,vancocin hcl,vancoled,vancomicina,vancomycin,vancomycin hcl,vancomycine,vancomycinum,vancor,viomycin derivative"	2	"g"	2	"g"	"13586-3,13587-1,20578-1,31012-8,39092-2,39796-8,39797-6,4089-9,4090-7,4091-5,4092-3,50938-0,59381-4,97657-1"
+"VAN"	14969	"Vancomycin"	"Glycopeptides"	"A07AA09,J01XA01,S01AA28"	"Other antibacterials"	"Glycopeptide antibacterials"	"va,van,vanc"	"vancocin,vancocin hcl,vancoled,vancomicina,vancomycin,vancomycin hcl,vancomycine,vancomycinum,vancor,viomycin derivative"	2	"g"	2	"g"	"13586-3,13587-1,19000-9,20578-1,23615-8,25228-8,31012-8,39092-2,39796-8,39797-6,4089-9,4090-7,4091-5,4092-3,50938-0,523-1,524-9,525-6,526-4,59381-4,7059-9,92241-9,97657-1"
 "VAM"		"Vancomycin-macromethod"	"Glycopeptides"	"NA"			""	""					""
-"VIO"	135398671	"Viomycin"	"Antimycobacterials"	"NA"			""	"celiomycin,florimycin,floromycin,tuberactinomycin b,vinacetin a,vioactane,viomicina,viomycin,viomycine,viomycinum"					""
+"VIO"	135398671	"Viomycin"	"Antimycobacterials"	"NA"			""	"celiomycin,florimycin,floromycin,tuberactinomycin b,vinacetin a,vioactane,viomicina,viomycin,viomycine,viomycinum"					"19001-7,23616-6,527-2,528-0,529-8,530-6"
 "VIR"	11979535	"Virginiamycine"	"Other antibacterials"	"NA"			""	"eskalin,eskalin v,micamicina,mikamycin,mikamycine,mikamycinum,ostreogricina,ostreogrycin,ostreogrycine,ostreogrycinum,pristinamicina,pristinamycin,pristinamycine,pristinamycinum,pyostacine,stafac,stafytracine,staphylomycin,stapyocine,starfac,streptogramin,vernamycin,virgimycin,virgimycine,virginiamicina,virginiamycin,virginiamycina,virginiamycine,virginiamycinum"					""
-"VOR"	71616	"Voriconazole"	"Antifungals/antimycotics"	"J02AC03"	"Antimycotics for systemic use"	"Triazole derivatives"	"vori,vrc"	"pfizer,vfend i.v.,voriconazol,voriconazole,voriconazole vfend,voriconazolum,voriconzole,vorikonazole"	0.4	"g"	0.4	"g"	"38370-3,53902-3,73676-9,80553-1,80651-3"
+"VOR"	71616	"Voriconazole"	"Antifungals/antimycotics"	"J02AC03"	"Antimycotics for systemic use"	"Triazole derivatives"	"vori,vrc"	"pfizer,vfend i.v.,voriconazol,voriconazole,voriconazole vfend,voriconazolum,voriconzole,vorikonazole"	0.4	"g"	0.4	"g"	"32379-0,35862-2,35863-0,38370-3,41199-1,41200-7,53902-3,73676-9,80553-1,80651-3"
 "XBR"	72144	"Xibornol"	"Other antibacterials"	"J01XX02"	"Other antibacterials"	"Other antibacterials"	""	"bactacine,bracen,nanbacine,xibornol,xibornolo,xibornolum"					""
 "ZID"	77846445	"Zidebactam"	"Other antibacterials"	"NA"			""	"zidebactam"					""
 "ZFD"		"Zoliflodacin"		"NA"			""	"zoliflodacin"					""
--- a/data-raw/antibiotics.xlsx
+++ b/data-raw/antibiotics.xlsx
--- a/data-raw/antibiotics.xpt
+++ b/data-raw/antibiotics.xpt
--- a/data-raw/antivirals.dta
+++ b/data-raw/antivirals.dta
--- a/data-raw/antivirals.feather
+++ b/data-raw/antivirals.feather
--- a/data-raw/antivirals.parquet
+++ b/data-raw/antivirals.parquet
--- a/data-raw/antivirals.rds
+++ b/data-raw/antivirals.rds
--- a/data-raw/antivirals.sas
+++ b/data-raw/antivirals.sas
--- a/data-raw/antivirals.sav
+++ b/data-raw/antivirals.sav
--- a/data-raw/antivirals.txt
+++ b/data-raw/antivirals.txt
@ -1,121 +1,121 @@
 "av"	"name"	"atc"	"cid"	"atc_group"	"synonyms"	"oral_ddd"	"oral_units"	"iv_ddd"	"iv_units"	"loinc"
-"ABA"	"Abacavir"	"J05AF06"	441300	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"abacavir sulfate,avacavir,ziagen"	0.6	"g"			"29113-8,78772-1,78773-9,79134-3,80118-3"
+"ABA"	"Abacavir"	"J05AF06"	441300	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"abacavir sulfate,avacavir,ziagen"	0.6	"g"			"29113-8,30273-7,30287-7,30303-2,78772-1,78773-9,79134-3,80118-3"
 "ACI"	"Aciclovir"	"J05AB01"	135398513	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"acicloftal,aciclovier,aciclovirum,activir,acyclofoam,acycloguanosine,acyclovir,acyclovir lauriad,avaclyr,cargosil,cyclovir,genvir,gerpevir,hascovir,maynar,novirus,poviral,sitavig,sitavir,vipral,viropump,virorax,zovirax,zyclir"	4	"g"	4	"g"	""
 "ADD"	"Adefovir dipivoxil"	"J05AF08"	60871	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"adefovir di,adefovir di ester,adefovir dipivoxyl,adefovir pivoxil,adefovirdipivoxl,bisadenine,bispmea,hepsera,preveon,youheding"	10	"mg"			""
 "AME"	"Amenamevir"	"J05AX26"	11397521	"Other antivirals"	"amenalief"	0.4	"g"			""
-"AMP"	"Amprenavir"	"J05AE05"	65016	"Protease inhibitors"	"agenerase,carbamate,prozei"	1.2	"g"			"29114-6,31028-4,78791-1"
+"AMP"	"Amprenavir"	"J05AE05"	65016	"Protease inhibitors"	"agenerase,carbamate,prozei"	1.2	"g"			"29114-6,30296-8,30297-6,30299-2,31028-4,49623-2,78791-1"
 "ASU"	"Asunaprevir"	"J05AP06"	16076883	"Antivirals for treatment of HCV infections"	"sunvepra,sunvepratrade"	0.2	"g"			""
-"ATA"	"Atazanavir"	"J05AE08"	148192	"Protease inhibitors"	"atazanavir base,latazanavir,reyataz,zrivada"	0.3	"g"			"41470-6,78796-0,78797-8,80142-3,80143-1"
+"ATA"	"Atazanavir"	"J05AE08"	148192	"Protease inhibitors"	"atazanavir base,latazanavir,reyataz,zrivada"	0.3	"g"			"41403-7,41470-6,41993-7,49618-2,49668-7,57907-8,78796-0,78797-8,80142-3,80143-1"
 "ATA+COBI"	"Atazanavir/cobicistat"	"J05AR15"	86583336	"Antivirals for treatment of HIV infections, combinations"	""					""
-"ATA+RIT"	"Atazanavir/ritonavir"	"J05AR23"	25134325	"Antivirals for treatment of HIV infections, combinations"	""	0.3	"g"			""
+"ATA+RIT"	"Atazanavir/ritonavir"	"J05AR23"	25134325	"Antivirals for treatment of HIV infections, combinations"	""	0.3	"g"			"49618-2,57907-8"
 "BAM"	"Baloxavir marboxil"	"J05AX25"	124081896	"Other antivirals"	"xofluza"	40	"mg"			""
-"BOC"	"Boceprevir"	"J05AP03"	10324367	"Antivirals for treatment of HCV infections"	"victrelis"	2.4	"g"			""
+"BOC"	"Boceprevir"	"J05AP03"	10324367	"Antivirals for treatment of HCV infections"	"victrelis"	2.4	"g"			"72859-2"
 "BRIN"	"Brincidofovir"	"J05AB17"	483477	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"cidofovir prodrug,tembexa"					""
 "BRIV"	"Brivudine"	"J05AB15"	446727	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"bridic,brivox,brivudin,brivudina,brivudinum,brvdurd,helpin,zerpex,zostex"	0.125	"g"			""
 "BUL"	"Bulevirtide"	"J05AX28"		"Other antivirals"	""					""
-"CAB"	"Cabotegravir"	"J05AJ04"	54713659	"Integrase inhibitors"	"cabenuva"	30	"mg"	10	"mg"	""
-"CID"	"Cidofovir"	"J05AB12"	60613	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"cidofovir anhydrous,cidofovir gel,cidofovir hydrate,cidofovirum,forvade,hpmpc dihydrate,phosphonic acid,vistide"			25	"mg"	""
+"CAB"	"Cabotegravir"	"J05AJ04"	54713659	"Integrase inhibitors"	"cabenuva"	30	"mg"	10	"mg"	"96566-5"
+"CID"	"Cidofovir"	"J05AB12"	60613	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"cidofovir anhydrous,cidofovir gel,cidofovir hydrate,cidofovirum,forvade,hpmpc dihydrate,phosphonic acid,vistide"			25	"mg"	"33628-9,72855-0,72856-8"
 "CLE"	"Clevudine"	"J05AF12"	73115	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"levovir,revovir"	30	"mg"			""
 "COBL"	"Coblopasvir"	"J05AP12"	58316387	"Antivirals for treatment of HCV infections"	""					""
-"DAC"	"Daclatasvir"	"J05AP07"	25154714	"Antivirals for treatment of HCV infections"	"daklinza"	60	"mg"			""
+"DAC"	"Daclatasvir"	"J05AP07"	25154714	"Antivirals for treatment of HCV infections"	"daklinza"	60	"mg"			"82379-9"
 "DAC+ASU+BEC"	"Daclatasvir/asunaprevir/beclabuvir"	"J05AP58"		"Antivirals for treatment of HCV infections"	""					""
-"DAR"	"Darunavir"	"J05AE10"	213039	"Protease inhibitors"	"carbamate,darunavirum,derunavir,prezista,prezista naive"	1.2	"g"			"57954-0"
+"DAR"	"Darunavir"	"J05AE10"	213039	"Protease inhibitors"	"carbamate,darunavirum,derunavir,prezista,prezista naive"	1.2	"g"			"49630-7,49666-1,55091-3,57954-0,57955-7"
 "DAR+COBI"	"Darunavir/cobicistat"	"J05AR14"	57327017	"Antivirals for treatment of HIV infections, combinations"	""					""
-"DAR+RIT"	"Darunavir/ritonavir"	"J05AR26"		"Antivirals for treatment of HIV infections, combinations"	""					""
+"DAR+RIT"	"Darunavir/ritonavir"	"J05AR26"		"Antivirals for treatment of HIV infections, combinations"	""					"49630-7,57955-7"
 "DAS"	"Dasabuvir"	"J05AP09"	56640146	"Antivirals for treatment of HCV infections"	""	0.5	"g"			""
 "DAS+OMB+PAR+RIT"	"Dasabuvir/ombitasvir/paritaprevir/ritonavir"	"J05AP52"		"Antivirals for treatment of HCV infections"	""					""
-"DEL"	"Delavirdine"	"J05AG02"	5625	"Non-nucleoside reverse transcriptase inhibitors"	"piperazine,rescriptor"	1.2	"g"			"27082-7,29115-3"
-"DID"	"Didanosine"	"J05AF02"	135398739	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"didanosina,didanosinum,dideoxyinosine,hypoxanthine ddn,videx ec"	0.4	"g"			"29116-1,48307-3"
-"DOL"	"Dolutegravir"	"J05AJ03"	54726191	"Integrase inhibitors"	"dolutegravir  dtg,soltegravir,tivicay"	50	"mg"			""
+"DEL"	"Delavirdine"	"J05AG02"	5625	"Non-nucleoside reverse transcriptase inhibitors"	"piperazine,rescriptor"	1.2	"g"			"27082-7,29115-3,30276-0,30290-1,30305-7"
+"DID"	"Didanosine"	"J05AF02"	135398739	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"didanosina,didanosinum,dideoxyinosine,hypoxanthine ddn,videx ec"	0.4	"g"			"29116-1,30270-3,30284-4,30300-8,48307-3"
+"DOL"	"Dolutegravir"	"J05AJ03"	54726191	"Integrase inhibitors"	"dolutegravir  dtg,soltegravir,tivicay"	50	"mg"			"101412-5,72857-6"
 "DOL+RIL"	"Dolutegravir/rilpivirine"	"J05AR21"	131801472	"Antivirals for treatment of HIV infections, combinations"	""					""
-"DOR"	"Doravirine"	"J05AG06"	58460047	"Non-nucleoside reverse transcriptase inhibitors"	"pifeltro"	0.1	"g"			""
-"EFA"	"Efavirenz"	"J05AG03"	64139	"Non-nucleoside reverse transcriptase inhibitors"	"efavirenz teva,efavirenzum,eravirenz,stocrin,strocin,sustiva,viraday"	0.6	"g"			"29117-9,33928-3,51907-4,51908-2"
-"ELB"	"Elbasvir"	"J05AP10"	71661251	"Antivirals for treatment of HCV infections"	"methyl carbamate"	50	"mg"			""
+"DOR"	"Doravirine"	"J05AG06"	58460047	"Non-nucleoside reverse transcriptase inhibitors"	"pifeltro"	0.1	"g"			"91897-9"
+"EFA"	"Efavirenz"	"J05AG03"	64139	"Non-nucleoside reverse transcriptase inhibitors"	"efavirenz teva,efavirenzum,eravirenz,stocrin,strocin,sustiva,viraday"	0.6	"g"			"29117-9,30277-8,30291-9,30306-5,33928-3,51907-4,51908-2"
+"ELB"	"Elbasvir"	"J05AP10"	71661251	"Antivirals for treatment of HCV infections"	"methyl carbamate"	50	"mg"			"82376-5"
 "ELB+GRA"	"Elbasvir/grazoprevir"	"J05AP54"	91669168	"Antivirals for treatment of HCV infections"	"zepatier"					""
-"ELV"	"Elvitegravir"	"J05AJ02"	5277135	"Integrase inhibitors"	"vitekta"					"88986-5"
-"EMT"	"Emtricitabine"	"J05AF09"	60877	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"coviracil,emtricitabinum,emtritabine,emtriva,racivir"	0.2	"g"			""
+"ELV"	"Elvitegravir"	"J05AJ02"	5277135	"Integrase inhibitors"	"vitekta"					"72526-7,88986-5"
+"EMT"	"Emtricitabine"	"J05AF09"	60877	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"coviracil,emtricitabinum,emtritabine,emtriva,racivir"	0.2	"g"			"41402-9,49669-5"
 "EMT+TEA"	"Emtricitabine/tenofovir alafenamide"	"J05AR17"	90469070	"Antivirals for treatment of HIV infections, combinations"	"descovy"					""
 "EMT+TEA+BIC"	"Emtricitabine/tenofovir alafenamide/bictegravir"	"J05AR20"		"Antivirals for treatment of HIV infections, combinations"	""					""
-"EMT+TEA+RIL"	"Emtricitabine/tenofovir alafenamide/rilpivirine"	"J05AR19"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "EMT+TEA+DAR+COBI"	"Emtricitabine/tenofovir alafenamide/darunavir/cobicistat"	"J05AR22"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "EMT+TEA+ELV+COBI"	"Emtricitabine/tenofovir alafenamide/elvitegravir/cobicistat"	"J05AR18"		"Antivirals for treatment of HIV infections, combinations"	""					""
+"EMT+TEA+RIL"	"Emtricitabine/tenofovir alafenamide/rilpivirine"	"J05AR19"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "EMT+TED+EFA"	"Emtricitabine/tenofovir disoproxil/efavirenz"	"J05AR06"		"Antivirals for treatment of HIV infections, combinations"	""					""
-"EMT+TED+RIL"	"Emtricitabine/tenofovir disoproxil/rilpivirine"	"J05AR08"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "EMT+TED+ELV+COBI"	"Emtricitabine/tenofovir disoproxil/elvitegravir/cobicistat"	"J05AR09"		"Antivirals for treatment of HIV infections, combinations"	""					""
-"ENF"	"Enfuvirtide"	"J05AX07"	16130199	"Other antivirals"	"enfurvitide,fuzeon,pentafuside"			0.18	"g"	""
+"EMT+TED+RIL"	"Emtricitabine/tenofovir disoproxil/rilpivirine"	"J05AR08"		"Antivirals for treatment of HIV infections, combinations"	""					""
+"ENF"	"Enfuvirtide"	"J05AX07"	16130199	"Other antivirals"	"enfurvitide,fuzeon,pentafuside"			0.18	"g"	"72858-4,82719-6"
 "ENI"	"Enisamium iodide"	"J05AX17"	10089466	"Other antivirals"	"amizon"	1.5	"g"			""
-"ENT"	"Entecavir"	"J05AF10"	135398508	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"baraclude,entecavir anhydrous"	0.5	"mg"			""
-"ETR"	"Etravirine"	"J05AG04"	193962	"Non-nucleoside reverse transcriptase inhibitors"	"dapy deriv,etravine,intelence"	0.4	"g"			"57961-5"
+"ENT"	"Entecavir"	"J05AF10"	135398508	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"baraclude,entecavir anhydrous"	0.5	"mg"			"56791-7"
+"ETR"	"Etravirine"	"J05AG04"	193962	"Non-nucleoside reverse transcriptase inhibitors"	"dapy deriv,etravine,intelence"	0.4	"g"			"52749-9,57961-5,72558-0"
 "FAL"	"Faldaprevir"	"J05AP04"	42601552	"Antivirals for treatment of HCV infections"	""					""
-"FAM"	"Famciclovir"	"J05AB09"	3324	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"famciclovirum,famvir,oravir"	0.75	"g"			""
+"FAM"	"Famciclovir"	"J05AB09"	3324	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"famciclovirum,famvir,oravir"	0.75	"g"			"72839-4"
 "FAV"	"Favipiravir"	"J05AX27"	492405	"Other antivirals"	"avigan,fapilavir,favilavir"	1.6	"g"			""
-"FOSA"	"Fosamprenavir"	"J05AE07"	131536	"Protease inhibitors"	"amprenavir phosphate,carbamate,lexiva,telzir"	1.4	"g"			""
-"FOSC"	"Foscarnet"	"J05AD01"	3415	"Phosphonic acid derivatives"	"forscarnet,foscarmet,foscavir,phosphonoformate,phosphonoformic acid"			6.5	"g"	""
+"FOSA"	"Fosamprenavir"	"J05AE07"	131536	"Protease inhibitors"	"amprenavir phosphate,carbamate,lexiva,telzir"	1.4	"g"			"42500-9,43736-8,51409-1,57965-6"
+"FOSC"	"Foscarnet"	"J05AD01"	3415	"Phosphonic acid derivatives"	"forscarnet,foscarmet,foscavir,phosphonoformate,phosphonoformic acid"			6.5	"g"	"256-8,42317-8,72834-5"
 "FOSF"	"Fosfonet"	"J05AD02"	546	"Phosphonic acid derivatives"	"fosfonet sodium,fosfonoacetate,fosfonoacetic acid,phosphonacetate,phosphonacetic acid,phosphonoaceticacid"					""
 "FOST"	"Fostemsavir"	"J05AX29"	11319217	"Other antivirals"	"rukobia"	1.2	"g"			""
-"GAN"	"Ganciclovir"	"J05AB06"	135398740	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"citovirax,cymevan,cymeven,cymevene,cytovene,ganciclovirum,gancyclovir,hydroxyacyclovir,virgan,vitrasert,zirgan"	3	"g"	0.5	"g"	"15367-6,25256-9,59798-9,59799-7,60077-5,60078-3"
+"GAN"	"Ganciclovir"	"J05AB06"	135398740	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"citovirax,cymevan,cymeven,cymevene,cytovene,ganciclovirum,gancyclovir,hydroxyacyclovir,virgan,vitrasert,zirgan"	3	"g"	0.5	"g"	"15367-6,25256-9,265-9,59798-9,59799-7,60077-5,60078-3,72854-3,72861-8"
 "GLE+PIB"	"Glecaprevir/pibrentasvir"	"J05AP57"	85471918	"Antivirals for treatment of HCV infections"	""					""
-"GRA"	"Grazoprevir"	"J05AP11"	44603531	"Antivirals for treatment of HCV infections"	""	0.1	"g"			""
+"GRA"	"Grazoprevir"	"J05AP11"	44603531	"Antivirals for treatment of HCV infections"	""	0.1	"g"			"82523-2"
 "IBA"	"Ibalizumab"	"J05AX23"		"Other antivirals"	""					""
 "IDO"	"Idoxuridine"	"J05AB02"	5905	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"antizona,dendrid,heratil,herplex,idossuridina,idoxene,idoxuridin,idoxuridina,idoxuridinum,iduoculos,iduridin,iododeoxyridine,iododeoxyuridine,iodoxuridine,joddeoxiuridin,kerecid,stoxil,virudox"					""
-"IND"	"Indinavir"	"J05AE02"	5362440	"Protease inhibitors"	"compound j,crixivan,indinavir anhydrous,propolis+indinavir"	2.4	"g"			"29118-7,31033-4,51918-1"
+"IND"	"Indinavir"	"J05AE02"	5362440	"Protease inhibitors"	"compound j,crixivan,indinavir anhydrous,propolis+indinavir"	2.4	"g"			"29118-7,30278-6,30292-7,30307-3,31033-4,49619-0,51918-1,57984-7"
 "INP"	"Inosine pranobex"	"J05AX05"	135449284	"Other antivirals"	"aviral,delimmun,groprinosin,immunovir,imunovir,imunoviral,inosiplex,isoprinosin,isoprinosina,isoprinosine,isoviral,methisoprinol,modimmunal,pranosina,pranosine,viruxan"	3	"g"			""
-"LAM"	"Lamivudine"	"J05AF05"	60825	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"epivir,hepitec,heptivir,heptodin,heptovir,lamivir,lamivudeine,lamivudine teva,lamivudinum,virolam,zeffix"	0.3	"g"			"29119-5,49226-4"
+"LAM"	"Lamivudine"	"J05AF05"	60825	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"epivir,hepitec,heptivir,heptodin,heptovir,lamivir,lamivudeine,lamivudine teva,lamivudinum,virolam,zeffix"	0.3	"g"			"29119-5,30269-5,30283-6,30298-4,49226-4,49620-8"
 "LAM+ABA"	"Lamivudine/abacavir"	"J05AR02"		"Antivirals for treatment of HIV infections, combinations"	""					""
+"LAM+ABA+DOL"	"Lamivudine/abacavir/dolutegravir"	"J05AR13"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAM+DOL"	"Lamivudine/dolutegravir"	"J05AR25"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAM+RAL"	"Lamivudine/raltegravir"	"J05AR16"	73386700	"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAM+TED"	"Lamivudine/tenofovir disoproxil"	"J05AR12"		"Antivirals for treatment of HIV infections, combinations"	""					""
-"LAM+ABA+DOL"	"Lamivudine/abacavir/dolutegravir"	"J05AR13"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAM+TED+DOL"	"Lamivudine/tenofovir disoproxil/dolutegravir"	"J05AR27"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAM+TED+DOR"	"Lamivudine/tenofovir disoproxil/doravirine"	"J05AR24"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAM+TED+EFA"	"Lamivudine/tenofovir disoproxil/efavirenz"	"J05AR11"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "LAN"	"Laninamivir"	"J05AH04"	502272	"Neuraminidase inhibitors"	""					""
 "LEN"	"Lenacapavir"	"J05AX31"	133082658	"Other antivirals"	""					""
 "LET"	"Letermovir"	"J05AX18"	45138674	"Other antivirals"	"acetic acid,prevymis"	0.48	"g"	0.48	"g"	""
-"LOP+RIT"	"Lopinavir/ritonavir"	"J05AR10"	11979606	"Antivirals for treatment of HIV infections, combinations"	"aluvia,kaletra,lopimune"	0.8	"g"			""
+"LOP+RIT"	"Lopinavir/ritonavir"	"J05AR10"	11979606	"Antivirals for treatment of HIV infections, combinations"	"aluvia,kaletra,lopimune"	0.8	"g"			"42000-0,57997-9"
 "LYS"	"Lysozyme"	"J05AX02"	16130991	"Other antivirals"	""					""
 "MARA"	"Maraviroc"	"J05AX09"	3002977	"Other antivirals"	"celsentri,selzentry"	0.6	"g"			"88987-3"
-"MARI"	"Maribavir"	"J05AX10"	471161	"Other antivirals"	"benzimidavir,camvia"					""
+"MARI"	"Maribavir"	"J05AX10"	471161	"Other antivirals"	"benzimidavir,camvia"					"72853-5"
 "MET"	"Metisazone"	"J05AA01"	667492	"Thiosemicarbazones"	"kemoviran,marboran,marborane,methisazon,methisazone,methsazone,metisazon,metisazona,metisazonum,viruzona"					""
 "MOR"	"Moroxydine"	"J05AX01"	71655	"Other antivirals"	"bimolin,moroxidina,moroxydinum,virugon,virumin,wirumin"	0.3	"g"			""
-"NEL"	"Nelfinavir"	"J05AE04"	64143	"Protease inhibitors"	"viracept"	2.25	"g"			"29120-3,32647-0,35113-0,51923-1"
-"NEV"	"Nevirapine"	"J05AG01"	4463	"Non-nucleoside reverse transcriptase inhibitors"	"nevirapine anhydrous,nevirapine teva,nevirapine),viramune,viramune ir,viramune xr"	0.4	"g"			"29121-1,32646-2,51925-6"
+"NEL"	"Nelfinavir"	"J05AE04"	64143	"Protease inhibitors"	"viracept"	2.25	"g"			"29120-3,30280-2,30294-3,30309-9,32647-0,35113-0,51923-1"
+"NEV"	"Nevirapine"	"J05AG01"	4463	"Non-nucleoside reverse transcriptase inhibitors"	"nevirapine anhydrous,nevirapine teva,nevirapine),viramune,viramune ir,viramune xr"	0.4	"g"			"29121-1,30275-2,30289-3,30311-5,32646-2,51925-6"
 "OMB+PAR+RIT"	"Ombitasvir/paritaprevir/ritonavir"	"J05AP53"		"Antivirals for treatment of HCV infections"	""					""
-"OSE"	"Oseltamivir"	"J05AH02"	65028	"Neuraminidase inhibitors"	"agucort,tamiflu,tamvir"	0.15	"g"			""
+"OSE"	"Oseltamivir"	"J05AH02"	65028	"Neuraminidase inhibitors"	"agucort,tamiflu,tamvir"	0.15	"g"			"60440-5,60441-3"
 "PEN"	"Penciclovir"	"J05AB13"	135398748	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"adenovir,denavir,penciceovir,penciclovirum,pencyclovir,vectavir"					"60140-1,60141-9"
 "PAIE"	"Pentanedioic acid imidazolyl ethanamide"	"J05AX21"	9942657	"Other antivirals"	"ingamine"	90	"mg"			""
 "PER"	"Peramivir"	"J05AH03"	154234	"Neuraminidase inhibitors"	"peramiflu,peramivir anhydrous,rapiacta,rapivab"			0.6	"g"	""
 "PLE"	"Pleconaril"	"J05AX06"	1684	"Other antivirals"	"picovir,pleconarilis"					""
-"RAL"	"Raltegravir"	"J05AJ01"	54671008	"Integrase inhibitors"	"isentress"	0.8	"g"			"72835-2"
+"RAL"	"Raltegravir"	"J05AJ01"	54671008	"Integrase inhibitors"	"isentress"	0.8	"g"			"61198-8,72525-9,72835-2"
 "REM"	"Remdesivir"	"J05AB16"	121304016	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"veklury"			0.1	"g"	""
 "RIB"	"Ribavirin"	"J05AP01"	37542	"Antivirals for treatment of HCV infections"	"copegus,cotronak,ravanex,rebetol,rebetron,rebretron,ribacine,ribamide,ribamidil,ribamidyl,ribasphere,ribavirin capsules,ribavirin mylan,ribavirin teva,ribavirina,ribavirine,ribavirinum,tribavirin,varazid,vilona,viramid,virazid,virazide,virazole"	1	"g"			"41469-8"
-"RIL"	"Rilpivirine"	"J05AG05"	6451164	"Non-nucleoside reverse transcriptase inhibitors"	"edurant,rilpivirina"	25	"mg"	15	"mg"	"80547-3"
+"RIL"	"Rilpivirine"	"J05AG05"	6451164	"Non-nucleoside reverse transcriptase inhibitors"	"edurant,rilpivirina"	25	"mg"	15	"mg"	"68463-9,72557-2,80547-3"
 "RIM"	"Rimantadine"	"J05AC02"	5071	"Cyclic amines"	"ethanamine,rimant,rimantadin,rimantadin a,rimantadina,rimantadinum"	0.2	"g"			""
-"RIT"	"Ritonavir"	"J05AE03"	392622	"Protease inhibitors"	"empetus,norvir,norvir softgel,ritomune,ritonavirum,ritovir,viekirax,viriton"	1.2	"g"			"29122-9,31027-6,51929-8,51930-6"
-"SAQ"	"Saquinavir"	"J05AE01"	441243	"Protease inhibitors"	"fortovase,invirase,saquinavirum"	1.8	"g"			"19051-2,29123-7,51932-2"
-"SIM"	"Simeprevir"	"J05AP05"	24873435	"Antivirals for treatment of HCV infections"	"olysio,simeprevir sodium"	0.15	"g"			""
-"SOF"	"Sofosbuvir"	"J05AP08"	45375808	"Antivirals for treatment of HCV infections"	"hepcinat,hepcvir,sovaldi,sovihep"	0.4	"g"			""
+"RIT"	"Ritonavir"	"J05AE03"	392622	"Protease inhibitors"	"empetus,norvir,norvir softgel,ritomune,ritonavirum,ritovir,viekirax,viriton"	1.2	"g"			"29122-9,30279-4,30293-5,30308-1,31027-6,51929-8,51930-6"
+"SAQ"	"Saquinavir"	"J05AE01"	441243	"Protease inhibitors"	"fortovase,invirase,saquinavirum"	1.8	"g"			"19051-2,29123-7,30281-0,30295-0,30310-7,49621-6,51932-2,58024-1"
+"SIM"	"Simeprevir"	"J05AP05"	24873435	"Antivirals for treatment of HCV infections"	"olysio,simeprevir sodium"	0.15	"g"			"82522-4"
+"SOF"	"Sofosbuvir"	"J05AP08"	45375808	"Antivirals for treatment of HCV infections"	"hepcinat,hepcvir,sovaldi,sovihep"	0.4	"g"			"82382-3"
 "SOF+LED"	"Sofosbuvir/ledipasvir"	"J05AP51"	72734365	"Antivirals for treatment of HCV infections"	"harvoni"					""
 "SOF+VEL"	"Sofosbuvir/velpatasvir"	"J05AP55"	91885554	"Antivirals for treatment of HCV infections"	"epclusa,epclusa tablet"					""
 "SOF+VEL+VOX"	"Sofosbuvir/velpatasvir/voxilaprevir"	"J05AP56"		"Antivirals for treatment of HCV infections"	""					""
-"STA"	"Stavudine"	"J05AF04"	18283	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"estavudina,sanilvudine,stavudinum,zerit xr,zerut xr"	80	"mg"			"29124-5,49227-2"
+"STA"	"Stavudine"	"J05AF04"	18283	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"estavudina,sanilvudine,stavudinum,zerit xr,zerut xr"	80	"mg"			"29124-5,30272-9,30286-9,30302-4,49227-2"
 "STA+LAM+NEV"	"Stavudine/lamivudine/nevirapine"	"J05AR07"	15979285	"Antivirals for treatment of HIV infections, combinations"	""					""
 "TEC"	"Tecovirimat"	"J05AX24"	16124688	"Other antivirals"	""					""
-"TELA"	"Telaprevir"	"J05AP02"	3010818	"Antivirals for treatment of HCV infections"	"incivek,incivo,telavic"	2.25	"g"			""
-"TELB"	"Telbivudine"	"J05AF11"	159269	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"epavudine,sebivo,telbivudin,tyzeka"	0.6	"g"			""
+"TELA"	"Telaprevir"	"J05AP02"	3010818	"Antivirals for treatment of HCV infections"	"incivek,incivo,telavic"	2.25	"g"			"72860-0"
+"TELB"	"Telbivudine"	"J05AF11"	159269	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"epavudine,sebivo,telbivudin,tyzeka"	0.6	"g"			"56792-5"
 "TEA"	"Tenofovir alafenamide"	"J05AF13"	9574768	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"vemlidy"	25	"mg"			""
 "TED"	"Tenofovir disoproxil"	"J05AF07"	5481350	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"bispmpa,pmpa prodrug,tenofovir,tenofovir bis,tenofovirdisoproxil,viread"	0.245	"g"			""
 "TED+EMT"	"Tenofovir disoproxil/emtricitabine"	"J05AR03"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "TIL"	"Tilorone"	"J05AX19"	5475	"Other antivirals"	"amixin ic,tiloron,tilorona,tiloronum"	0.125	"g"			""
-"TIP"	"Tipranavir"	"J05AE09"	54682461	"Protease inhibitors"	"aptivus"	1	"g"			"57383-2"
+"TIP"	"Tipranavir"	"J05AE09"	54682461	"Protease inhibitors"	"aptivus"	1	"g"			"42535-5,43737-6,49622-4,49667-9,57383-2,58029-0"
 "TRO"	"Tromantadine"	"J05AC03"	64377	"Cyclic amines"	"tromantadina,tromantadinum"					""
 "UMI"	"Umifenovir"	"J05AX13"	131411	"Other antivirals"	"arbidol,arbidol base"	0.8	"g"			""
 "VALA"	"Valaciclovir"	"J05AB11"	135398742	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"talavir,valacv,valacyclovir,valcivir,valcyclovir,valtrex,virval,zelitrex"	3	"g"			""
 "VALG"	"Valganciclovir"	"J05AB14"	135413535	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"cymeval"	0.9	"g"			"74960-6"
 "VID"	"Vidarabine"	"J05AB03"	21704	"Nucleosides and nucleotides excl. reverse transcriptase inhibitors"	"adenine arabinoside,araadenosine,arabinoside adenine,arabinosyl adenine,arabinosyladenine,spongoadenosine,vidarabin,vidarabina,vidarabine anhydrous,vidarabinum,vira a,vira atm"			0.7	"g"	""
-"ZAL"	"Zalcitabine"	"J05AF03"	24066	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"dideoxycytidine,interferon ad + ddc,zalcitibine"	2.25	"mg"			"29125-2"
-"ZAN"	"Zanamivir"	"J05AH01"	60855	"Neuraminidase inhibitors"	"modified sialic acid,relenza,zanamavir,zanamivi,zanamivirhydrate"			1.2	"g"	""
-"ZID"	"Zidovudine"	"J05AF01"	35370	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"azidothymidine,beta interferon,compound s,propolis+azt,retrovir,trizivir,zidovudina,zidovudinum"	0.6	"g"	0.6	"g"	"29126-0,6894-0"
+"ZAL"	"Zalcitabine"	"J05AF03"	24066	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"dideoxycytidine,interferon ad + ddc,zalcitibine"	2.25	"mg"			"29125-2,30271-1,30285-1,30301-6"
+"ZAN"	"Zanamivir"	"J05AH01"	60855	"Neuraminidase inhibitors"	"modified sialic acid,relenza,zanamavir,zanamivi,zanamivirhydrate"			1.2	"g"	"75029-9"
+"ZID"	"Zidovudine"	"J05AF01"	35370	"Nucleoside and nucleotide reverse transcriptase inhibitors"	"azidothymidine,beta interferon,compound s,propolis+azt,retrovir,trizivir,zidovudina,zidovudinum"	0.6	"g"	0.6	"g"	"29126-0,30268-7,30282-8,531-4,6894-0"
 "ZID+LAM"	"Zidovudine/lamivudine"	"J05AR01"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "ZID+LAM+ABA"	"Zidovudine/lamivudine/abacavir"	"J05AR04"		"Antivirals for treatment of HIV infections, combinations"	""					""
 "ZID+LAM+NEV"	"Zidovudine/lamivudine/nevirapine"	"J05AR05"		"Antivirals for treatment of HIV infections, combinations"	""					""
--- a/data-raw/antivirals.xlsx
+++ b/data-raw/antivirals.xlsx
--- a/data-raw/antivirals.xpt
+++ b/data-raw/antivirals.xpt
--- a/data-raw/av.md5
+++ b/data-raw/av.md5
@ -1 +1 @@
-009fea3738cdb6390dccd470cb27f015
+1bb751091ed77d3d8c8c0ccad3583483
--- a/data-raw/clin_break.md5
+++ b/data-raw/clin_break.md5
@ -1 +1 @@
-0a9ea3545d68b95108a28096d975388f
+c4a5519e0ecc74220fc768e944a372f7
--- a/data-raw/clinical_breakpoints.dta
+++ b/data-raw/clinical_breakpoints.dta
--- a/data-raw/clinical_breakpoints.feather
+++ b/data-raw/clinical_breakpoints.feather
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dr. M.S. (Matthijs) Berends	4c11a7bd9c	v2.1.1	2023-10-22 15:51:27 +02:00
dr. M.S. (Matthijs) Berends	ca72a646d0	scientific notation for MICs	2023-10-20 15:45:00 +02:00
dr. M.S. (Matthijs) Berends	bcab4bc9ba	Fixes #123	2023-10-20 15:07:11 +02:00
dr. M.S. (Matthijs) Berends	7cda9e575b	prepare for CRAN	2023-10-20 14:51:48 +02:00
dr. M.S. (Matthijs) Berends	7dc96794be	fix rounding MICs on R-devel	2023-07-20 08:24:27 +02:00
dr. M.S. (Matthijs) Berends	a2cbbf470e	AMR v2.1.0 pre-release	2023-07-16 16:18:53 +02:00
dr. M.S. (Matthijs) Berends	7a4628b73f	Added C. freundii complex and Y. pseudotuberculosis complex	2023-07-14 10:49:06 +02:00
dr. M.S. (Matthijs) Berends	fd480d1a9a	console hyperlink fix	2023-07-14 09:50:13 +02:00
dr. M.S. (Matthijs) Berends	08f7256852	include unit tests again	2023-07-13 12:45:14 +01:00
dr. M.S. (Matthijs) Berends	ddd01f9410	test to remove unit tests from build	2023-07-13 09:42:37 +01:00
dr. M.S. (Matthijs) Berends	eff164ecb1	indicate unique identifiers	2023-07-12 21:26:32 +02:00
dr. M.S. (Matthijs) Berends	ea2a4652e9	mouse-hover fixes	2023-07-12 15:27:43 +01:00
dr. M.S. (Matthijs) Berends	e1b4f99f4f	breakpoints fixes	2023-07-12 15:20:04 +01:00
dr. M.S. (Matthijs) Berends	0c46f61260	MO group fixes	2023-07-12 15:04:48 +01:00
dr. M.S. (Matthijs) Berends	9cf054903b	version bump	2023-07-12 11:42:29 +01:00
dr. M.S. (Matthijs) Berends	7cd9ca274c	add strep groups to ABCG	2023-07-12 11:41:25 +01:00
dr. M.S. (Matthijs) Berends	66eeeb4b88	cleanup	2023-07-11 14:29:40 +02:00
dr. M.S. (Matthijs) Berends	8df1cd8d97	interpretation fixes	2023-07-11 09:50:45 +02:00
dr. M.S. (Matthijs) Berends	5e1221bceb	unit test	2023-07-10 19:04:12 +02:00
dr. M.S. (Matthijs) Berends	dab20c09f6	unit test	2023-07-10 18:30:26 +02:00
dr. M.S. (Matthijs) Berends	1b499bf012	fixes	2023-07-10 17:02:28 +02:00
dr. M.S. (Matthijs) Berends	a4e2e25e3f	reftbl in plots, speedup for as.sir() and mo_validate	2023-07-10 16:43:46 +02:00
dr. M.S. (Matthijs) Berends	70c601ca11	breakpoints UTI interpretation fix	2023-07-10 13:41:52 +02:00
dr. M.S. (Matthijs) Berends	3829311dd3	random() fix	2023-07-08 21:00:49 +02:00
dr. M.S. (Matthijs) Berends	acb534102b	new species groups, updated clinical breakpoints	2023-07-08 17:30:05 +02:00
dr. M.S. (Matthijs) Berends	2d97cca6d9	fix `reference_df` endless loop	2023-06-26 13:52:02 +02:00
dr. M.S. (Matthijs) Berends	1d9ee39cc7	fix for mo codes	2023-06-22 15:24:18 +02:00
Dr. Matthijs Berends	f065945d7b	Update clinical breakpoints and fix some `as.mo()` bugs (#117 ) * Updates clinical breakpoints EUCAST/CLSI 2023, fixes #102, fixes #112, fixes #113, fixes #114, fixes #115 * docs * implement ecoffs * unit tests	2023-06-22 15:10:59 +02:00
dr. M.S. (Matthijs) Berends	9591688811	documentation update	2023-05-27 10:39:22 +02:00
dr. M.S. (Matthijs) Berends	e1966503ee	unit testing R4.3	2023-05-26 20:37:00 +02:00
dr. M.S. (Matthijs) Berends	766db4e21f	as.mo fix	2023-05-26 19:20:21 +02:00
dr. M.S. (Matthijs) Berends	c6135d2082	updated microorganism codes	2023-05-26 16:10:01 +02:00
dr. M.S. (Matthijs) Berends	0bcf55d3b6	improve `as.mo()`	2023-05-24 15:55:53 +02:00
dr. M.S. (Matthijs) Berends	3018fb87a9	`icu_exclude` in `first_isolate()`, fixes #110	2023-05-17 22:12:10 +02:00