+ revised map tiles swapping logic so Hybrid can be used