Use data-schema so that distinction is made based on metadata schema in
organisation selector