Replaced filter-based routing with address-based routing

Routing time went from ~20/100 ms to > 0.01