code review #1089 - clean up location class filtering and a few other misc items