diff --git a/ckanext/odsh/i18n/ckanext-odsh.pot b/ckanext/odsh/i18n/ckanext-odsh.pot
index 6e320737ca9e42da239ae203366154c26101da93..c0b2bef65a05e96982fe43584908dbac4ea967da 100644
--- a/ckanext/odsh/i18n/ckanext-odsh.pot
+++ b/ckanext/odsh/i18n/ckanext-odsh.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-odsh 0.0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-03-03 08:46+0100\n"
+"POT-Creation-Date: 2023-06-05 10:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: ckanext/odsh/plugin.py:226 ckanext/odsh/plugin.py:235 ckanext/odsh/plugin.py:241
-#: ckanext/odsh/templates/header.html:51
+#: ckanext/odsh/plugin.py:227 ckanext/odsh/plugin.py:236 ckanext/odsh/plugin.py:242
+#: ckanext/odsh/templates/header.html:45
 #: ckanext/odsh/templates/organization/index.html:3
 #: ckanext/odsh/templates/organization/index.html:6
 #: ckanext/odsh/templates/organization/index.html:33
@@ -28,15 +28,15 @@ msgstr ""
 msgid "Organizations"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:227 ckanext/odsh/plugin.py:238 ckanext/odsh/plugin.py:244
+#: ckanext/odsh/plugin.py:228 ckanext/odsh/plugin.py:239 ckanext/odsh/plugin.py:245
 msgid "Category"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:228 ckanext/odsh/plugin.py:236 ckanext/odsh/plugin.py:242
+#: ckanext/odsh/plugin.py:229 ckanext/odsh/plugin.py:237 ckanext/odsh/plugin.py:243
 msgid "File format"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:229 ckanext/odsh/plugin.py:237 ckanext/odsh/plugin.py:243
+#: ckanext/odsh/plugin.py:230 ckanext/odsh/plugin.py:238 ckanext/odsh/plugin.py:244
 #: ckanext/odsh/templates/package/resource_read.html:170
 #: ckanext/odsh/templates/package/snippets/info.html:75
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:91
@@ -44,7 +44,7 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: ckanext/odsh/plugin.py:231
+#: ckanext/odsh/plugin.py:232
 msgid "Open-Data-Eigenschaften"
 msgstr ""
 
@@ -78,7 +78,7 @@ msgid "Link to a URL on the internet (you can also link to an API)"
 msgstr ""
 
 #: ckanext/odsh/fanstatic/odsh_image-upload.js:71
-#: ckanext/odsh/templates/header.html:62
+#: ckanext/odsh/templates/header.html:56
 msgid "Upload"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 #: ckanext/odsh/fanstatic/odsh_image-upload.js:115
 #: ckanext/odsh/fanstatic/odsh_image-upload.js:186
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:18
-#: ckanext/odsh/templates/package/snippets/resource_form.html:31
+#: ckanext/odsh/templates/package/snippets/resource_form.html:30
 msgid "URL"
 msgstr ""
 
@@ -108,52 +108,52 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:44
+#: ckanext/odsh/templates/header.html:38
 msgid "Menu"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:50
-#: ckanext/odsh/templates/organization/read.html:37
+#: ckanext/odsh/templates/header.html:44
+#: ckanext/odsh/templates/organization/read.html:33
 #: ckanext/odsh/templates/package/base.html:7
 #: ckanext/odsh/templates/package/base.html:17
 #: ckanext/odsh/templates/package/base.html:22
 #: ckanext/odsh/templates/package/read.html:19
 #: ckanext/odsh/templates/package/read.html:24
-#: ckanext/odsh/templates/package/search.html:9
+#: ckanext/odsh/templates/package/search.html:10
 msgid "Datasets"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:55
+#: ckanext/odsh/templates/header.html:49
 msgid "Infos"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:59
+#: ckanext/odsh/templates/header.html:53
 msgid "Harvester"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:84
+#: ckanext/odsh/templates/header.html:77
 msgid "View profile"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:92
+#: ckanext/odsh/templates/header.html:85
 msgid "Edit profile"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:99 ckanext/odsh/templates/user/logout.html:4
+#: ckanext/odsh/templates/header.html:92 ckanext/odsh/templates/user/logout.html:4
 msgid "Logout"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:108 ckanext/odsh/templates/user/login.html:3
+#: ckanext/odsh/templates/header.html:101 ckanext/odsh/templates/user/login.html:3
 #: ckanext/odsh/templates/user/login.html:10
 #: ckanext/odsh/templates/user/login.html:16
 msgid "Login"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:113
+#: ckanext/odsh/templates/header.html:106
 msgid "Sign language"
 msgstr ""
 
-#: ckanext/odsh/templates/header.html:116
+#: ckanext/odsh/templates/header.html:109
 msgid "Simple language"
 msgstr ""
 
@@ -316,7 +316,7 @@ msgstr ""
 
 #: ckanext/odsh/templates/datarequests/comment.html:22
 #: ckanext/odsh/templates/datarequests/show.html:19
-#: ckanext/odsh/templates/organization/read.html:63
+#: ckanext/odsh/templates/organization/read.html:58
 #: ckanext/odsh/templates/package/snippets/close_mobile_sidebar_button.html:2
 msgid "Close"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "No Data Requests found with the given criteria"
 msgstr ""
 
 #: ckanext/odsh/templates/datarequests/snippets/datarequest_list.html:13
-#: ckanext/odsh/templates/organization/index.html:50
+#: ckanext/odsh/templates/organization/index.html:48
 msgid "How about creating one?"
 msgstr ""
 
@@ -477,8 +477,10 @@ msgstr ""
 #: ckanext/odsh/templates/macros/form.html:410
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:60
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:92
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:143
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:189
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:245
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:292
 msgid "This field is required"
 msgstr ""
 
@@ -506,11 +508,25 @@ msgstr ""
 msgid "Add Organization"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/index.html:37
+#: ckanext/odsh/templates/organization/index.html:36
 msgid "Search organizations..."
 msgstr ""
 
-#: ckanext/odsh/templates/organization/index.html:48
+#: ckanext/odsh/templates/organization/index.html:36
+#: ckanext/odsh/templates/organization/read.html:27
+#: ckanext/odsh/templates/snippets/search_form.html:6
+#: ckanext/odsh/templates/snippets/search_form.html:12
+msgid "Name Ascending"
+msgstr ""
+
+#: ckanext/odsh/templates/organization/index.html:36
+#: ckanext/odsh/templates/organization/read.html:28
+#: ckanext/odsh/templates/snippets/search_form.html:6
+#: ckanext/odsh/templates/snippets/search_form.html:13
+msgid "Name Descending"
+msgstr ""
+
+#: ckanext/odsh/templates/organization/index.html:46
 msgid "There are currently no organizations for this site"
 msgstr ""
 
@@ -521,53 +537,40 @@ msgstr ""
 msgid "Add dataset"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:27
+#: ckanext/odsh/templates/organization/read.html:26
 #: ckanext/odsh/templates/snippets/search_form.html:11
 msgid "Relevance"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:28
-#: ckanext/odsh/templates/snippets/search_form.html:6
-#: ckanext/odsh/templates/snippets/search_form.html:12
-msgid "Name Ascending"
-msgstr ""
-
 #: ckanext/odsh/templates/organization/read.html:29
-#: ckanext/odsh/templates/snippets/search_form.html:6
-#: ckanext/odsh/templates/snippets/search_form.html:13
-msgid "Name Descending"
-msgstr ""
-
-#: ckanext/odsh/templates/organization/read.html:30
 #: ckanext/odsh/templates/snippets/search_form.html:14
 msgid "Issued Ascending"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:31
+#: ckanext/odsh/templates/organization/read.html:30
 #: ckanext/odsh/templates/snippets/search_form.html:15
 msgid "Issued Descending"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:32
+#: ckanext/odsh/templates/organization/read.html:31
 #: ckanext/odsh/templates/snippets/package_item.html:84
 #: ckanext/odsh/templates/snippets/search_form.html:20
 msgid "Popular"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:36
-msgid ""
-"Search\n"
-"datasets..."
+#: ckanext/odsh/templates/organization/read.html:33
+#: ckanext/odsh/templates/snippets/search_form.html:3
+msgid "Search datasets..."
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:54
-#: ckanext/odsh/templates/package/search.html:17
-#: ckanext/odsh/templates/package/search.html:48
+#: ckanext/odsh/templates/organization/read.html:49
+#: ckanext/odsh/templates/package/search.html:18
+#: ckanext/odsh/templates/package/search.html:51
 msgid "Filter"
 msgstr ""
 
-#: ckanext/odsh/templates/organization/read.html:55
-#: ckanext/odsh/templates/package/search.html:50
+#: ckanext/odsh/templates/organization/read.html:50
+#: ckanext/odsh/templates/package/search.html:53
 msgid "Reset"
 msgstr ""
 
@@ -577,7 +580,7 @@ msgid "There is no description for this organization"
 msgstr ""
 
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:10
-#: ckanext/odsh/templates/package/snippets/resource_form.html:37
+#: ckanext/odsh/templates/package/snippets/resource_form.html:36
 msgid "Name"
 msgstr ""
 
@@ -592,8 +595,8 @@ msgstr ""
 
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:53
 msgid ""
-"Are you sure you want to delete this Organization? This will delete all the "
-"public and private datasets belonging to this organization."
+"Are you sure you want to delete this Organization? Note*: Deleting cannot be "
+"performed while public or private datasets belong to this organization."
 msgstr ""
 
 #: ckanext/odsh/templates/organization/snippets/organization_form.html:56
@@ -620,7 +623,7 @@ msgstr ""
 
 #: ckanext/odsh/templates/package/edit_base.html:23
 #: ckanext/odsh/templates/package/resource_edit_base.html:28
-#: ckanext/odsh/templates/package/snippets/resource_form.html:83
+#: ckanext/odsh/templates/package/snippets/resource_form.html:81
 msgid "Back"
 msgstr ""
 
@@ -679,7 +682,7 @@ msgid ""
 msgstr ""
 
 #: ckanext/odsh/templates/package/new_view.html:32
-#: ckanext/odsh/templates/package/snippets/resource_form.html:111
+#: ckanext/odsh/templates/package/snippets/resource_form.html:117
 msgid "Add"
 msgstr ""
 
@@ -824,53 +827,53 @@ msgid "Created"
 msgstr ""
 
 #: ckanext/odsh/templates/package/resource_read.html:166
-#: ckanext/odsh/templates/package/snippets/resource_form.html:72
+#: ckanext/odsh/templates/package/snippets/resource_form.html:70
 #: ckanext/odsh/templates/package/snippets/resource_info.html:26
 msgid "Format"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:66
+#: ckanext/odsh/templates/package/search.html:69
 #: ckanext/odsh/templates/package/snippets/info.html:52
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:142
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:143
 msgid "Period"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:77
+#: ckanext/odsh/templates/package/search.html:79
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:156
 #: ckanext/odsh/templates/snippets/search_form.html:117
 msgid "from"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:80
+#: ckanext/odsh/templates/package/search.html:82
 msgid "date start"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:84
-#: ckanext/odsh/templates/package/search.html:99
+#: ckanext/odsh/templates/package/search.html:86
+#: ckanext/odsh/templates/package/search.html:101
 msgid "Date"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:88
+#: ckanext/odsh/templates/package/search.html:90
 #: ckanext/odsh/templates/snippets/search_form.html:130
 msgid "wrong_start_date_for_search"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:92
+#: ckanext/odsh/templates/package/search.html:94
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:170
 #: ckanext/odsh/templates/snippets/search_form.html:144
 msgid "to"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:95
+#: ckanext/odsh/templates/package/search.html:97
 msgid "date end"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:103
+#: ckanext/odsh/templates/package/search.html:105
 #: ckanext/odsh/templates/snippets/search_form.html:157
 msgid "wrong_end_date_for_search"
 msgstr ""
 
-#: ckanext/odsh/templates/package/search.html:106
+#: ckanext/odsh/templates/package/search.html:108
 msgid "submit date search"
 msgstr ""
 
@@ -936,12 +939,8 @@ msgstr ""
 msgid "in south"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/info.html:125
-msgid "Share this dataset"
-msgstr ""
-
-#: ckanext/odsh/templates/package/snippets/info.html:140
-msgid "send an email"
+#: ckanext/odsh/templates/package/snippets/info.html:123
+msgid "DCAT-AP.de metadata"
 msgstr ""
 
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:20
@@ -963,7 +962,7 @@ msgid ""
 msgstr ""
 
 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:118
-#: ckanext/odsh/templates/user/snippets/login_form.html:22
+#: ckanext/odsh/templates/user/snippets/login_form.html:23
 msgid "enter name"
 msgstr ""
 
@@ -1004,82 +1003,84 @@ msgid "Next: Add Data"
 msgstr ""
 
 #: ckanext/odsh/templates/package/snippets/package_form.html:46
-#: ckanext/odsh/templates/package/snippets/resource_form.html:117
+#: ckanext/odsh/templates/package/snippets/resource_form.html:123
 msgid "Required information"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:12
+#: ckanext/odsh/templates/package/snippets/resource_form.html:11
 msgid "odsh Create Dataset"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:28
+#: ckanext/odsh/templates/package/snippets/resource_form.html:27
 msgid "odsh_resource_upload_error_label"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:31
+#: ckanext/odsh/templates/package/snippets/resource_form.html:30
 msgid "Data-Upload"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:31
+#: ckanext/odsh/templates/package/snippets/resource_form.html:30
 msgid "http://example.com/external-data.csv"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:36
+#: ckanext/odsh/templates/package/snippets/resource_form.html:35
 msgid "odsh_resource_name_error_label"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:37
+#: ckanext/odsh/templates/package/snippets/resource_form.html:36
 msgid "Enter name of the dataset"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:52
+#: ckanext/odsh/templates/package/snippets/resource_form.html:50
 msgid "Last Modified"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:52
+#: ckanext/odsh/templates/package/snippets/resource_form.html:50
 msgid "eg. 2012-06-05"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:55
+#: ckanext/odsh/templates/package/snippets/resource_form.html:53
 msgid "File Size"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:55
+#: ckanext/odsh/templates/package/snippets/resource_form.html:53
 msgid "eg. 1024"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:58
-#: ckanext/odsh/templates/package/snippets/resource_form.html:61
+#: ckanext/odsh/templates/package/snippets/resource_form.html:56
+#: ckanext/odsh/templates/package/snippets/resource_form.html:59
 msgid "MIME Type"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:58
+#: ckanext/odsh/templates/package/snippets/resource_form.html:56
 msgid "eg. application/json"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:61
+#: ckanext/odsh/templates/package/snippets/resource_form.html:59
 msgid ""
 "eg.\n"
-"    application/json"
+"  application/json"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:70
+#: ckanext/odsh/templates/package/snippets/resource_form.html:68
 msgid "odsh_resource_format_error_label"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:72
+#: ckanext/odsh/templates/package/snippets/resource_form.html:70
 msgid "eg. CSV, XML or JSON"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:86
-msgid "Another dataset"
+#: ckanext/odsh/templates/package/snippets/resource_form.html:84
+msgid ""
+"Another\n"
+"          dataset"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:95
+#: ckanext/odsh/templates/package/snippets/resource_form.html:93
 msgid "Are you sure you want to delete this resource?"
 msgstr ""
 
-#: ckanext/odsh/templates/package/snippets/resource_form.html:106
+#: ckanext/odsh/templates/package/snippets/resource_form.html:110
 msgid "Upload dataset"
 msgstr ""
 
@@ -1233,10 +1234,6 @@ msgstr ""
 msgid "Search dataset"
 msgstr ""
 
-#: ckanext/odsh/templates/snippets/search_form.html:3
-msgid "Search datasets..."
-msgstr ""
-
 #: ckanext/odsh/templates/snippets/search_form.html:4
 msgid "Order by"
 msgstr ""
@@ -1382,7 +1379,7 @@ msgid "Change details"
 msgstr ""
 
 #: ckanext/odsh/templates/user/edit_user_form.html:8
-#: ckanext/odsh/templates/user/snippets/login_form.html:21
+#: ckanext/odsh/templates/user/snippets/login_form.html:22
 msgid "Username"
 msgstr ""
 
@@ -1428,7 +1425,7 @@ msgid "Old Password"
 msgstr ""
 
 #: ckanext/odsh/templates/user/edit_user_form.html:38
-#: ckanext/odsh/templates/user/snippets/login_form.html:26
+#: ckanext/odsh/templates/user/snippets/login_form.html:27
 msgid "Password"
 msgstr ""
 
@@ -1465,15 +1462,15 @@ msgstr ""
 msgid "You are now logged out."
 msgstr ""
 
-#: ckanext/odsh/templates/user/snippets/login_form.html:27
+#: ckanext/odsh/templates/user/snippets/login_form.html:28
 msgid "enter password"
 msgstr ""
 
-#: ckanext/odsh/templates/user/snippets/login_form.html:30
+#: ckanext/odsh/templates/user/snippets/login_form.html:31
 msgid "Remember me"
 msgstr ""
 
-#: ckanext/odsh/templates/user/snippets/login_form.html:36
+#: ckanext/odsh/templates/user/snippets/login_form.html:37
 msgid "do Login"
 msgstr ""