Fixed bugs in existing routes