Update: improved performance of OpenStreetMap and Google Maps functionality.