Improved route loading per #1274