Fix RFC3986 compliance
Add default NS support