Correct handling of properties which consist of several parts (e.g. "terms-of-use") in respect to plural form.