BZ-10187: swap street view and map order