fixes for map tab