Filtering changes

All filtering changes EXCEPT for removing the mobility accommodations system.