fixing ordering issue with routes