Fixed error in DataModel code.
When processing Sources, set 'uri' on the ParseResult to the original input value for the Source.
Use source.uri rather than source.geturl()
Corrected error in parse_object function.