Fix a few issues when the ";" character was being used within URIs. Proper encoding/decoding now in place.