selection bugfix, better map highlighting/selection