The terms.xml of each context should not be used. Separate context specific OWL files for storing context specific (non classifying) terms and their definitions is needed. File name should be; [context]-terms-[lang].owl. Until this is implemented, context specific terms should be stored in plcs-terms-[lang].owl, possibly with a translation in plcs-terms-en.owl.
Agree -- but this will require a lot of changes to the XSLT