clean up control panel queries

cleanup for efficiency 2 of 3: control panel facility usage page.
for 20 students / 2 groups, reduced from 133 queries to 16 queries.
This was taking upwards of 3s on my macbook air; now 323ms