Fix to the fix. Also, works for Class as well.
Small problem: doesn't select Troupe or Combo due to complication with queryset. TODO: this as Q() objecti