encode uri fixes
merging doctran