Fixing category spaces and underscores.