diff --git a/app/Controller/OrganisationsController.php b/app/Controller/OrganisationsController.php
index 74faabf38..cbbf53dce 100644
--- a/app/Controller/OrganisationsController.php
+++ b/app/Controller/OrganisationsController.php
@@ -171,8 +171,8 @@ class OrganisationsController extends AppController
                     } else {
                         $temp['Organisation'][$field] = $existingOrg['Organisation'][$field];
                     }
-                    $this->request->data = $temp;
                 }
+                $this->request->data = $temp;
             }
             $this->request->data['Organisation']['id'] = $id;
             if ($this->Organisation->save($this->request->data)) {
diff --git a/app/files/scripts/stix2/stix2misp.py b/app/files/scripts/stix2/stix2misp.py
index bf4becb21..1a63f7cf5 100644
--- a/app/files/scripts/stix2/stix2misp.py
+++ b/app/files/scripts/stix2/stix2misp.py
@@ -944,6 +944,7 @@ class ExternalStixParser(StixParser):
                                 ('ipv6-addr',): self.parse_ip_address_pattern,
                                 ('network-traffic',): self.parse_network_traffic_pattern,
                                 ('process',): self.parse_process_pattern,
+                                ('url',): self.parse_url_pattern,
                                 ('windows-registry-key',): self.parse_regkey_pattern}
         self.pattern_forbidden_relations = (' LIKE ', ' FOLLOWEDBY ', ' MATCHES ', ' ISSUBSET ', ' ISSUPERSET ', ' REPEATS ')
 
@@ -1050,6 +1051,14 @@ class ExternalStixParser(StixParser):
     ##                             PARSING FUNCTIONS.                             ##
     ################################################################################
 
+    def add_attributes_from_pattern(self, attribute_type, pattern, uuid):
+        _, pattern_values = self.get_types_and_values_from_pattern(pattern)
+        attribute = {'to_ids': True}
+        if len(pattern_values) == 1 and uuid is not None:
+            attribute['uuid'] = uuid
+        for value in pattern_values:
+            self.misp_event.add_attribute(attribute_type, value, **attribute)
+
     @staticmethod
     def  attributes_from_dict(values, mapping_dict, to_ids):
         attributes = []
@@ -1121,12 +1130,7 @@ class ExternalStixParser(StixParser):
             self.misp_event.add_attribute('ip-dst', observable.value, **attribute)
 
     def parse_ip_address_pattern(self, pattern, uuid=None):
-        _, pattern_values = self.get_types_and_values_from_pattern(pattern)
-        attribute = {'to_ids': True}
-        if len(pattern_values) == 1:
-            attribute['uuid'] = uuid
-        for value in pattern_values:
-            self.misp_event.add_attribute('ip-dst', value, **attribute)
+        self.add_attributes_from_pattern('ip-dst', pattern, uuid)
 
     def parse_ip_network_traffic_observable(self, objects, uuid):
         network_traffic = self.fetch_network_traffic_objects(objects)
@@ -1212,6 +1216,9 @@ class ExternalStixParser(StixParser):
         _object = objects['0']
         self.misp_event.add_attribute(**{'type': 'url', 'value': _object.value, 'uuid': uuid, 'to_ids': False})
 
+    def parse_url_pattern(self, pattern, uuid=None):
+        self.add_attributes_from_pattern('url', pattern, uuid)
+
     def parse_url_object_observable(self, objects, uuid):
         attributes = self.attributes_from_url_observable(objects)
         self.handle_import_case(attributes, 'url', uuid)
diff --git a/cti-python-stix2 b/cti-python-stix2
index f0ac7aeb3..f527e279b 160000
--- a/cti-python-stix2
+++ b/cti-python-stix2
@@ -1 +1 @@
-Subproject commit f0ac7aeb3cb857bb2242e69ee2d3471a2e812d22
+Subproject commit f527e279b39285263c18a0860afe4b2523613df1