Further improvements to map building selection