Tweak route collector

Handle closure