bug fixes for map screen