Fix URI tokenisation
Merge pull request #1422 from Treora/fix_uri_tokenisation

Fix URI tokenisation