diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/properties.sql
index cce103ca..f6c2d923 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/properties.sql
@@ -29,9 +29,8 @@ WHERE
     {% if scid %}
     nsp.oid={{scid}}::oid AND
     {% else %}
-    {% if show_sysobj %}
-    nspname NOT LIKE E'pg\\_temp\\_%' AND
-    nspname NOT LIKE E'pg\\_toast\\_temp\\_%' AND
+    {% if not show_sysobj %}
+    nspname NOT LIKE E'pg\\_%' AND
     {% endif %}
     {% endif %}
     NOT (
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/properties.sql
index ca2254d0..a99e0509 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/properties.sql
@@ -46,9 +46,8 @@ WHERE
     {% if scid %}
     nsp.oid={{scid}}::oid AND
     {% else %}
-    {% if show_sysobj %}
-    nspname NOT LIKE E'pg\\_temp\\_%' AND
-    nspname NOT LIKE E'pg\\_toast\\_temp\\_%' AND
+    {% if not show_sysobj %}
+    nspname NOT LIKE E'pg\\_%' AND
     {% endif %}
     {% endif %}
     NOT (
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/properties.sql
index fcb25ded..9335cd10 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/properties.sql
@@ -40,9 +40,8 @@ WHERE
     {% if scid %}
     nsp.oid={{scid}}::oid AND
     {% else %}
-    {% if show_sysobj %}
-    nspname NOT LIKE E'pg\\_temp\\_%' AND
-    nspname NOT LIKE E'pg\\_toast\\_temp\\_%' AND
+    {% if not show_sysobj %}
+    nspname NOT LIKE E'pg\\_%' AND
     {% endif %}
     {% endif %}
     NOT (
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/properties.sql
index 41e681a5..965e27af 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/properties.sql
@@ -39,9 +39,8 @@ WHERE
     {% if scid %}
     nsp.oid={{scid}}::oid AND
     {% else %}
-    {% if show_sysobj %}
-    nspname NOT LIKE E'pg\\_temp\\_%' AND
-    nspname NOT LIKE E'pg\\_toast\\_temp\\_%' AND
+    {% if not show_sysobj %}
+    nspname NOT LIKE E'pg\\_%' AND
     {% endif %}
     {% endif %}
     nsp.nspparent = 0 AND
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/properties.sql
index d32e8c27..5d2f3682 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/properties.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/properties.sql
@@ -46,9 +46,8 @@ WHERE
     {% if scid %}
     nsp.oid={{scid}}::oid AND
     {% else %}
-    {% if show_sysobj %}
-    nspname NOT LIKE E'pg\\_temp\\_%' AND
-    nspname NOT LIKE E'pg\\_toast\\_temp\\_%' AND
+    {% if not show_sysobj %}
+    nspname NOT LIKE E'pg\\_%' AND
     {% endif %}
     {% endif %}
     nsp.nspparent = 0 AND