Fix Charset encoding issues
Categories refactorisation