fix mappings - language should be analyzed