same modification as soop_asf_mt. fix geom issues

ready to be redeploy