More missed entity escapes. Also, set default prefix to base + "#"