fix popup and marker click