YH-183: Fixed issues based on skos validator