Clean up routing for matches by using collection