Fixed string parsing for classes that have the format 1- 1A (like ES classes)
Fixed ES department to remove 1 that is not in department name