Optimized map component updates a bit. Now there should be no "double updates" on initial rendering.