More organization information in the Data Slicer

We like to track both churches and schools of our students. Currently, in the Data Slicer, I can only get the primary organization. We could use the organizations table filtered to one type (maybe church) and have the primary organization be the other (school). However, we need to be able to have the locations of the organizations in the output (the First Baptist Church problem again). Would it be possible to have primary organizations in each category (church, school, etc.)? Could the organizations table be included in the Data Slicer?