Added better routing. Fixed incorrect initial collection when switching sites.