fixing routes order