Updated marker click handling