fdc: rework pick_geometry