Add couch view to help debug upload problems
Fix issues with xml file
Tiny cleanup
Merge pull request #3475 from dimagi/uth

Misc UTH fixes