Fix a very serious bug with resulted in the wrong id being generated and the wrong descriptions being indexed. *Slow hand clap at self*
Merge branch 'master' into skos_expansion