* Added small fix to trim leading/trailing from URIs (string values with
white spaces would generate URIs with white spaces, invalid)