Geometry attributes are now filtered out of the table more gracefully