DDF-605  added support for _geo suffix
DDF-605  removed commented out code