Improve URI normalization to not encode "-", "." or "~" (or anything else that shouldn't be).