support for different geom attributeName. clean up