diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-22.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-22.sql
index e1aeda58c35ec..aec2bedeef7b4 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-22.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-22.sql
@@ -1 +1 @@
-DELETE FROM `#__extensions` WHERE `element` = 'phputf8';
+DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'phputf8';
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-28.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-28.sql
index d41a3ed7c2d1d..e15a8aae22bdf 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-28.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-09-28.sql
@@ -1 +1 @@
-DELETE FROM `#__extensions` WHERE `element` = 'p3p';
+DELETE FROM `#__extensions` WHERE `type` = 'plugin' AND `element` = 'p3p' AND `folder` = 'system';
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-10-02.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-10-02.sql
index c2ad1ef2b5ca2..fff66fbcaa7fd 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-10-02.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-10-02.sql
@@ -1,3 +1,3 @@
-DELETE FROM `#__extensions` WHERE `element` = 'hathor';
-DELETE FROM `#__template_styles` WHERE `template` = 'hathor';
+DELETE FROM `#__extensions` WHERE `type` = 'template' AND `element` = 'hathor' AND `client_id` = 1;
+DELETE FROM `#__template_styles` WHERE `template` = 'hathor' AND `client_id` = 1;
 ALTER TABLE `#__user_keys` DROP COLUMN `invalid`;
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
index 132cc997bf657..1a30a2142b410 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
@@ -1,6 +1,5 @@
 INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
 ('plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
 
-INSERT INTO `#__postinstall_messages` (`title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
-VALUES
-('PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1);
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+SELECT extension_id, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-02-24.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-02-24.sql
index bbc42dfcf190d..c059604cc7e58 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-02-24.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-02-24.sql
@@ -1 +1 @@
-DELETE FROM `#__extensions` WHERE `element` = 'idna_convert';
+DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'idna_convert';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-22.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-22.sql
index 52ed5dd4931f3..fe28e9edd896e 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-22.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-22.sql
@@ -1 +1 @@
-DELETE FROM "#__extensions" WHERE "element" = 'phputf8';
+DELETE FROM "#__extensions" WHERE "type" = 'library' AND "element" = 'phputf8';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-28.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-28.sql
index 4865cbc66a605..849208445012c 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-28.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-28.sql
@@ -1 +1 @@
-DELETE FROM "#__extensions" WHERE "element" = 'p3p';
+DELETE FROM "#__extensions" WHERE "type" = 'plugin' AND "element" = 'p3p' AND "folder" = 'system';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-02.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-02.sql
index e95d6c8b318f7..670b689e38c85 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-02.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-02.sql
@@ -1,3 +1,3 @@
-DELETE FROM "#__extensions" WHERE "element" = 'hathor';
-DELETE FROM "#__template_styles" WHERE "template" = 'hathor';
+DELETE FROM "#__extensions" WHERE "type" = 'template' AND "element" = 'hathor' AND "client_id" = 1;
+DELETE FROM "#__template_styles" WHERE "template" = 'hathor' AND "client_id" = 1;
 ALTER TABLE "#__user_keys" DROP COLUMN "invalid";
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
index ffaefc84acc58..09c9b7d090136 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
@@ -1,6 +1,5 @@
 INSERT INTO "#__extensions" (name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
 ('plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
 
-INSERT INTO "#__postinstall_messages" ("title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
-VALUES
-('PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1);
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+SELECT "extension_id", 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-02-24.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-02-24.sql
index e1282bb17f8e0..ec7188ece3569 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-02-24.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-02-24.sql
@@ -1 +1 @@
-DELETE FROM "#__extensions" WHERE "element" = 'idna_convert';
+DELETE FROM "#__extensions" WHERE "type" = 'library' AND "element" = 'idna_convert';