Routing working again, vestigial filters removed
Merge branch 'RoutingCleanup'

Bringing in changes to fix errors in filters