Fix the Join Class logic when more than one class is being displayed.