FAIMS-421 - fix geometry and intersect selections