Handle geometries with text content around them
Fixing type annotation