leaflet directive improvements