Moved the check on the taxonomies in the base Risk Calculator, so that it works for all calculators