backend changes for gmaps
merge