Replace double single quotes in names with single quotes
Categorisation improvements