Fixed id names in APIs to make logic clearer for validations and observations
Merge branch 'feature/visualisations' into feature/angular