Fixes for map tab