+ added full support for map unit swapping for UI