diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
index f4c389d..ddb1fab 100644
--- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
+++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
@@ -395,7 +395,7 @@ NSString * const KeyActionTypeOpen = @"openPage";
         } else {
             [MVMCoreDispatchUtility performBlockInBackground:^{
                 // Cannot linkaway, show error.
-                MVMCoreErrorObject *error = error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess] code:ErrorCodeLinkawayFailed domain:ErrorDomainNative location:[NSString stringWithFormat:@"%@_%@",NSStringFromClass([delegateObject.actionDelegate class]),KeyActionTypeLinkAway]];
+                MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess] code:ErrorCodeLinkawayFailed domain:ErrorDomainNative location:[NSString stringWithFormat:@"%@_%@",NSStringFromClass([delegateObject.actionDelegate class]),KeyActionTypeLinkAway]];
                 [self handleActionError:error actionInformation:actionInformation additionalData:additionalData delegateObject:delegateObject];
             }];
         }
diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
index 5279dcc..d90af0a 100644
--- a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
+++ b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
@@ -68,11 +68,11 @@
         self.contextRoot = [actionMap string:KeyContextRoot];
         NSString *alternateBase = [actionMap string:@"baseURL"];
         if (alternateBase) {
-            self.alternateBaseURL = [NSURL URLWithString:[alternateBase stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLHostAllowedCharacterSet]];
+            self.alternateBaseURL = [NSURL URLWithString:alternateBase];
         }
         NSString *url = [actionMap string:@"URL"];
         if (url) {
-            self.URL = [NSURL URLWithString:[url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+            self.URL = [NSURL URLWithString:url];
         }
         self.actionMap = actionMap;
         self.customTimeoutTime = [actionMap optionalNumberForKey:@"customTimeoutTime"];