wip xml entity handling
oops leftover from debug
fix ET regression (all tests should not be OK, even though I'd like that)