BUGFIX: Selected class can now contain more classes or special characters