make sure all table refs are prefixed
dont convert html entities for now
uri fixes