diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql
index 32117ec..a1e531a 100644
--- a/dal/db_query/queries.sql
+++ b/dal/db_query/queries.sql
@@ -736,25 +736,25 @@ ORDER BY u.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetTagsWithPagination :many
 SELECT t.*, COUNT(*) OVER() as total_count
-FROM tags t JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1) u ON t.AccountID = u.AmoID
+FROM tags t JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false) u ON t.AccountID = u.AmoID
 WHERE t.Deleted = false
 ORDER BY t.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetStepsWithPagination :many
 SELECT s.*, COUNT(*) OVER() as total_count
-FROM steps s JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1) u ON s.AccountID = u.AmoID
+FROM steps s JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false) u ON s.AccountID = u.AmoID
 WHERE s.Deleted = false AND PipelineID = $4
 ORDER BY s.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetPipelinesWithPagination :many
 SELECT p.*, COUNT(*) OVER() as total_count
-FROM pipelines p JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1) u ON p.AccountID = u.AmoID
+FROM pipelines p JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false) u ON p.AccountID = u.AmoID
 WHERE p.Deleted = false
 ORDER BY p.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetFieldsWithPagination :many
 SELECT f.*, COUNT(*) OVER() as total_count
-FROM fields f JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1) u ON f.AccountID = u.AmoID
+FROM fields f JOIN (SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false) u ON f.AccountID = u.AmoID
 WHERE f.Deleted = false
 ORDER BY f.ID OFFSET ($2 - 1) * $3 LIMIT $3;