Fix issues incorrect geom id extraction