more refactor/simplification and map pin selection implementation