diff --git a/config/config.php b/config/config.php
index e1a35fe..2ce33a6 100644
--- a/config/config.php
+++ b/config/config.php
@@ -55,59 +55,62 @@
             'bekendmaking'  => new Service([
                 'identifier'    => 'bekendmaking',
                 'title'         => 'Bekendmaking',
-                'url'           => 'https://zoek.officielebekendmakingen.nl/sru/Search',
+                'url'           => 'https://repository.overheid.nl/sru',
                 'default_attr'  => [
-                    'version'       => '1.2',
-                    'operation'     => 'searchRetrieve'
+                    'version'       => '2.0',
                 ],
                 'mapping'   => [
+                    'creator'           => 'dt.creator',
+                    'date'              => 'dt.date',
                     'startRecord'       => 'startRecord',
                     'maximumRecords'    => 'maximumRecords',
                     'query'             => 'query',
                     'numberOfRecords'   => 'numberOfRecords',
                     'records'           => 'records/record',
-                    'identifier'        => 'recordData/gzd/originalData/overheidop:meta/overheidop:owmskern/dcterms:identifier',
-                    'title'             => 'recordData/gzd/originalData/overheidop:meta/overheidop:owmskern/dcterms:title',
-                    'permalink'         => 'recordData/gzd/enrichedData/url',
+                    'identifier'        => 'recordData/gzd/originalData/meta/owmskern/identifier',
+                    'title'        => 'recordData/gzd/originalData/meta/owmskern/title',
+                    'permalink'         => 'recordData/gzd/enrichedData/preferredUrl',
                     'meta'              => [
-                        'subject'           => 'recordData/gzd/originalData/overheidop:meta/overheidop:owmsmantel/dcterms:subject',
-                        'organisationtype'  => 'recordData/gzd/originalData/overheidop:meta/overheidop:opmeta/overheid:organisationtype',
-                        'publicationname'   => 'recordData/gzd/originalData/overheidop:meta/overheidop:opmeta/overheid:publicationname',
+                        'subject'           => 'recordData/gzd/originalData/meta/owmsmantel/subject',
+                        'organisationtype'  => 'recordData/gzd/originalData/meta/tpmeta/organisatietype',
+                        'publicationname'   => 'recordData/gzd/originalData/meta/tpmeta/publicatienaam',
                     ],
-                    'created_at'        => 'recordData/gzd/originalData/overheidop:meta/overheidop:owmsmantel/dcterms:date',
-                    'updated_at'        => 'recordData/gzd/originalData/overheidop:meta/overheidop:owmskern/dcterms:modified',
-                ]
+                    'created_at'        => 'recordData/gzd/originalData/meta/owmsmantel/date',
+                    'updated_at'        => 'recordData/gzd/originalData/meta/owmskern/modified',
+                ],
             ]),
             'regelingen_verordeningen' => new Service([
                 'identifier'    => 'regelingen_verordeningen',
                 'title'         => 'Regelingen en verordeningen',
-                'url'           => 'http://zoekdienst.overheid.nl/sru/Search',
+                'url'           => 'https://zoekservice.overheid.nl/sru/Search',
                 'default_attr'  => [
                     'version'       => '1.2',
                     'operation'     => 'searchRetrieve',
-                    'x-connection'  => 'cvdr'
+                    'x-connection'  => 'cvdr',
                 ],
                 'mapping'       => [
+                    'creator'           => 'creator',
+                    'date'              => 'issued',
                     'startRecord'       => 'startRecord',
                     'maximumRecords'    => 'maximumRecords',
                     'query'             => 'query',
                     'numberOfRecords'   => 'numberOfRecords',
                     'records'           => 'records/record',
-                    'identifier'        => 'recordData/gzd/originalData/overheidrg:meta/owmskern/dcterms:identifier',
-                    'title'             => 'recordData/gzd/originalData/overheidrg:meta/owmskern/dcterms:title',
-                    'permalink'         => 'recordData/gzd/enrichedData/publicatieurl_xhtml',
+                    'identifier'        => 'recordData/gzd/originalData/meta/owmskern/identifier',
+                    'title'             => 'recordData/gzd/originalData/meta/owmskern/title',
+                    'permalink'         => 'recordData/gzd/enrichedData/preferred_url',
                     'meta'              => [
-                        'subject'           => 'recordData/gzd/originalData/overheidrg:meta/owmsmantel/dcterms:subject',
-                        'subject_alt'       => 'recordData/gzd/originalData/overheidrg:meta/cvdripm/overheidrg:onderwerp',
+                        'subject'           => 'recordData/gzd/originalData/meta/owmsmantel/subject',
+                        'subject_alt'       => 'recordData/gzd/originalData/meta/owmsmantel/alternative',
                         'organisationtype'  => 'recordData/gzd/enrichedData/organisatietype',
-                        'publicationname'   => 'recordData/gzd/originalData/overheidrg:meta/owmsmantel/dcterms:isFormatOf',
-                        'betreft'           => 'recordData/gzd/originalData/overheidrg:meta/cvdripm/overheidrg:betreft',
-                        'kenmerk'           => 'recordData/gzd/originalData/overheidrg:meta/cvdripm/overheidrg:kenmerk',
+                        'publicationname'   => 'recordData/gzd/originalData/meta/owmsmantel/isFormatOf',
+                        'betreft'           => 'recordData/gzd/originalData/meta/cvdripm/betreft',
+                        'kenmerk'           => 'recordData/gzd/originalData/meta/cvdripm/kenmerk',
                     ],
-                    'created_at'        => 'recordData/gzd/originalData/overheidrg:meta/owmsmantel/dcterms:issued',
-                    'updated_at'        => 'recordData/gzd/originalData/overheidrg:meta/owmskern/dcterms:modified',
-                ]
-            ])
+                    'created_at'        => 'recordData/gzd/originalData/meta/owmsmantel/issued',
+                    'updated_at'        => 'recordData/gzd/originalData/meta/owmskern/modified',
+                ],
+            ]),
         ];
-    }
+    },
 ];
diff --git a/src/Providers/ImportProvider.php b/src/Providers/ImportProvider.php
index 7fc0195..ffe81a9 100644
--- a/src/Providers/ImportProvider.php
+++ b/src/Providers/ImportProvider.php
@@ -286,7 +286,7 @@ protected function create_current_services_import()
             $service->set_limited_offset()->set_max_records(1);
             $service->set_query([
                 'creator'       => $this->settings->creator,
-                'created_at'    => [
+                'date'    => [
                     'value'         => date_i18n('Y-m-d', strtotime($last_date)),
                     'compare'       => '>='
                 ]
@@ -430,7 +430,7 @@ protected function import_by_import_service($import_service)
         $service->set_max_records($this->max_import);
         $service->set_query([
             'creator'       => $this->settings->creator,
-            'created_at'    => [
+            'date'    => [
                 'value'         => date_i18n('Y-m-d', strtotime($import_service['date_offset'])),
                 'compare'       => '>='
             ]
diff --git a/src/Service.php b/src/Service.php
index 4f2bf90..187f896 100644
--- a/src/Service.php
+++ b/src/Service.php
@@ -70,7 +70,7 @@ public function set_query(array $query): self
 
     public function set_default_sort(): self
     {
-        $this->sort_by = $this->getLastFieldname('created_at');
+        $this->sort_by = $this->getLastFieldname('date');
 
         return $this;
     }
@@ -280,7 +280,7 @@ protected function getQueryUrlParameter(): string
                 '%s%s"%s"',
                 $this->getLastFieldname($field),
                 $comparator,
-                urlencode($value)
+                $value
             );
         }
 
@@ -297,7 +297,7 @@ protected function getSortString(): string
             // Remove sort from string to prevent double appending
             $order = str_replace('sort.', '', $this->sort_order);
 
-            return ' sortby ' . $this->sort_by . '/sort.' . $order;
+            return urlencode(' sortby ' . $this->sort_by . '/sort.' . $order);
         }
 
         return '';