* Add descriptions and labels for queries and providers, and labels for normalisation rules in addition to the description support