Enhancement to map and table clicks.