code review #1089 - clean up location class filtering, support more flexible location sets in a few places, and a few other misc items as per code review