Need reports that include "Extra" Classes

We have started using "Extra" classes recently and have found that they are not included in any reports. They even aren't included in the class calendar for a room ;( Ideally I would like at least a report that just lists all of the extra classes for a season.

It also is important that the extra classes show up on the room calendar, so that rooms are not double booked. (e.g. if you show the class calendar with all rooms, the extra class displays, but if you show the just the room where the extra class is assigned, it is not on that calendar)