Fix multi-route support