Include composer name in category entry
Remove redundant composer name in composer.dat files