Matched features (geometries) to attributes
Added geometry checks