Improve support to cover 31 doctypes
hmm
Verify that no space between fpi and uri is valid