fixed routes and included current_order