Add geometry helper and fix circle selection.