security fix: encode all htmls-entetirs from URI
Merge branch 'chris' into config