aXcelerate Calendar Filters - Trainer & Organisation

I think it would be benificial for us to be able to filter the aXcelerate Calendar by:

• Trainer (Rather than user, as some of our Trainer's aren't set up as users so we cannot filter by them)
• Organisation (would be nice to be able to see an organisations booked courses at a glance on the calendar)