Retrieving points as points now instead of polygons, so Geometry is being populated correctly.