diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj
index 12d7ab4..d181d1b 100644
--- a/MVMCore/MVMCore.xcodeproj/project.pbxproj
+++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj
@@ -946,6 +946,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1007,6 +1008,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
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 b8e5877..3ba9319 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"];
diff --git a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift
index a5d3229..028af05 100644
--- a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift
+++ b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift
@@ -12,12 +12,18 @@ public protocol ActionModelProtocol: ModelProtocol {
     var actionType: String { get }
     var extraParameters: JSONValueDictionary? { get set }
     var analyticsData: JSONValueDictionary? { get set }
+    var accessibilityIdentifier: String? { get set }
 }
 
 public extension ActionModelProtocol {
     
     var actionType: String {
-        get { return Self.identifier }
+        get { Self.identifier }
+    }
+    
+    var accessibilityIdentifier: String? {
+        get { nil }
+        set { }
     }
     
     static var categoryCodingKey: String {
diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m
index e32ec74..ed2feee 100644
--- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m
+++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m
@@ -69,16 +69,16 @@
 - (NSDictionary *) getHardCodedResponseForRequest:(MVMCoreRequestParameters *)request {
     NSDictionary *cannedResponse = nil;
     
-    if(_jsonDictionary) {
+    if (_jsonDictionary) {
         BOOL matchesQuery = NO;
-        for(NSString *urlKey in _sortedKeys) {
+        for (NSString *urlKey in _sortedKeys) {
             NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithString:urlKey];
-            if([urlComponents.path isEqualToString:request.pageType]) {
+            if ([urlComponents.path isEqualToString:request.pageType]) {
                 matchesQuery = YES;
-                if(urlComponents.query) {
-                    for(NSURLQueryItem *item in urlComponents.queryItems) {
+                if (urlComponents.query) {
+                    for (NSURLQueryItem *item in urlComponents.queryItems) {
                         NSString *requestVal = [request.parameters stringForKey:item.name];
-                        if(!requestVal || ![requestVal isEqualToString:item.value]) {
+                        if (!requestVal || ![requestVal isEqualToString:item.value]) {
                             matchesQuery = NO;
                             break;
                         }
@@ -88,7 +88,7 @@
                     cannedResponse = _jsonDictionary[urlKey];
                     // keep searching to see if there is a more exact match on parameters
                 }
-                if(matchesQuery) {
+                if (matchesQuery) {
                     cannedResponse = _jsonDictionary[urlKey];
                     // found a request parameters match, accept as the best result and break out
                     break;
@@ -101,7 +101,6 @@
         cannedResponse = [self getHardCodedResponseForPageType:request.pageType];
     }
     
-    
     return cannedResponse;
 }