fixed all nested routes issues