more improvements to map and list adapter