Move collection fetching out of router