Fixed escaping of numeric entities