More work on mapsites