Fix order taxi functionality