Revert "tolerate empty tags in URI"

This reverts commit 9f15bba67be62fc701d74de024350a9621b02530.