diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql
index d5d4d78..5e47fa0 100644
--- a/dal/db_query/queries.sql
+++ b/dal/db_query/queries.sql
@@ -688,19 +688,31 @@ SELECT * FROM users WHERE AccountID = $1;
 UPDATE users SET Name = $1, "Group" = $2, Email = $3, Role = $4 WHERE AmoID = $5;
 
 -- name: GetUsersWithPagination :many
-SELECT *, COUNT(*) OVER() as total_count FROM users WHERE Deleted = false  ORDER BY ID OFFSET ($1 - 1) * $2 LIMIT $2;
+SELECT *, COUNT(*) OVER() as total_count FROM users WHERE Deleted = false AND AccountID = $3 ORDER BY ID OFFSET ($1 - 1) * $2 LIMIT $2;
 
 -- name: GetTagsWithPagination :many
-SELECT *, COUNT(*) OVER() as total_count FROM tags WHERE Deleted = false  ORDER BY ID OFFSET ($1 - 1) * $2 LIMIT $2;
+SELECT t.*, COUNT(*) OVER() as total_count
+FROM tags t JOIN (SELECT AmoID FROM users WHERE AccountID = $1) u ON t.AccountID = u.AmoID
+WHERE t.Deleted = false
+ORDER BY t.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetStepsWithPagination :many
-SELECT *, COUNT(*) OVER() as total_count FROM steps WHERE Deleted = false  ORDER BY ID OFFSET ($1 - 1) * $2 LIMIT $2;
+SELECT s.*, COUNT(*) OVER() as total_count
+FROM steps s JOIN (SELECT AmoID FROM users WHERE AccountID = $1) u ON s.AccountID = u.AmoID
+WHERE s.Deleted = false
+ORDER BY s.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetPipelinesWithPagination :many
-SELECT *, COUNT(*) OVER() as total_count FROM pipelines WHERE Deleted = false  ORDER BY ID OFFSET ($1 - 1) * $2 LIMIT $2;
+SELECT p.*, COUNT(*) OVER() as total_count
+FROM pipelines p JOIN (SELECT AmoID FROM users WHERE AccountID = $1) u ON p.AccountID = u.AmoID
+WHERE p.Deleted = false
+ORDER BY p.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: GetFieldsWithPagination :many
-SELECT *, COUNT(*) OVER() as total_count FROM fields WHERE Deleted = false  ORDER BY ID OFFSET ($1 - 1) * $2 LIMIT $2;
+SELECT f.*, COUNT(*) OVER() as total_count
+FROM fields f JOIN (SELECT AmoID FROM users WHERE AccountID = $1) u ON f.AccountID = u.AmoID
+WHERE f.Deleted = false
+ORDER BY f.ID OFFSET ($2 - 1) * $3 LIMIT $3;
 
 -- name: UpdateTags :exec
 UPDATE tags AS t
@@ -818,7 +830,6 @@ WITH user_data AS (
 )
 SELECT * from inserted_fields;
 
-
 -- name: CheckSteps :many
 WITH new_steps AS (
     SELECT (step->>'AmoID')::INT AS amoID,