Update terms with list from Arnaud (hierarchical) + update demo content