Add manufacturer and category names to keywords.

More...