OPENAM-5375 CR-6077 Improve 12.0 additional fields (fix typos, add tags, ...)
Integrating AME-2372 branch part II: * Moving resources to their correct locations