Map - ability to double click - refactor