fixing some problems with Map-service