diff --git a/db/queries/api/v1/lists/followers/create_function__get_unique_followers_by_list.sql b/db/queries/api/v1/lists/followers/create_function__get_unique_followers_by_list.sql
index 9eb6d7a..52a25ad 100644
--- a/db/queries/api/v1/lists/followers/create_function__get_unique_followers_by_list.sql
+++ b/db/queries/api/v1/lists/followers/create_function__get_unique_followers_by_list.sql
@@ -102,11 +102,11 @@ BEGIN
         -- match the address parameter
         v.record_data = addr_bytea AND
         -- Valid record data lookup
-        v.user IS NOT NULL --AND
+        v.user IS NOT NULL AND
         -- NOT blocked
-        -- v.has_block_tag = FALSE AND
+        v.has_block_tag = FALSE AND
         -- NOT muted
-        -- v.has_mute_tag = FALSE
+        v.has_mute_tag = FALSE
     GROUP BY
         v.user,
         v.token_id,
diff --git a/db/queries/api/v1/users/primary-list/create_function__get_address_by_list.sql b/db/queries/api/v1/users/primary-list/create_function__get_address_by_list.sql
index 13665ce..16f21d3 100644
--- a/db/queries/api/v1/users/primary-list/create_function__get_address_by_list.sql
+++ b/db/queries/api/v1/users/primary-list/create_function__get_address_by_list.sql
@@ -20,9 +20,9 @@ BEGIN
     INTO primary_list_address
     FROM efp_lists as v,  efp_account_metadata AS meta
     WHERE v.token_id = primary_list_id AND (
-		meta.address = v.user AND
-		convert_hex_to_bigint(meta.value) = v.token_id
-	);
+        meta.address = v.user AND
+        convert_hex_to_bigint(meta.value) = v.token_id
+    );
 
     RETURN primary_list_address;
 END;
diff --git a/db/schema/050__views/002/events__efp_accounts_with_primary_list/create_view__events__efp_accounts_with_primary_list.sql b/db/schema/050__views/002/events__efp_accounts_with_primary_list/create_view__events__efp_accounts_with_primary_list.sql
index e1788d0..39465a2 100644
--- a/db/schema/050__views/002/events__efp_accounts_with_primary_list/create_view__events__efp_accounts_with_primary_list.sql
+++ b/db/schema/050__views/002/events__efp_accounts_with_primary_list/create_view__events__efp_accounts_with_primary_list.sql
@@ -32,10 +32,10 @@ OR REPLACE VIEW public.view__events__efp_accounts_with_primary_list AS
 SELECT 
 	v.user as address, 
 	v.token_id as primary_list_token_id
-FROM efp_lists as v,  efp_account_metadata AS meta
+FROM public.efp_lists as v,  public.efp_account_metadata AS meta
 WHERE 
 	meta.address = v.user AND
-	convert_hex_to_bigint(meta.value) = v.token_id;
+	public.convert_hex_to_bigint(meta.value) = v.token_id;
 
 
 -- migrate:down
diff --git a/db/schema/050__views/003/events__efp_list_records_with_manager_user_tags/create_view__events__efp_list_records_with_manager_user_tags.sql b/db/schema/050__views/003/events__efp_list_records_with_manager_user_tags/create_view__events__efp_list_records_with_manager_user_tags.sql
index 9da95fb..49b9551 100644
--- a/db/schema/050__views/003/events__efp_list_records_with_manager_user_tags/create_view__events__efp_list_records_with_manager_user_tags.sql
+++ b/db/schema/050__views/003/events__efp_list_records_with_manager_user_tags/create_view__events__efp_list_records_with_manager_user_tags.sql
@@ -33,7 +33,7 @@ FROM
   LEFT JOIN PUBLIC.efp_lists AS l ON l.list_storage_location_chain_id = record_tags.chain_id
   AND l.list_storage_location_contract_address = record_tags.contract_address
   AND l.list_storage_location_slot = record_tags.slot
-  INNER JOIN efp_account_metadata meta ON l.user = meta.address AND l.token_id = convert_hex_to_bigint(meta.value);
+  INNER JOIN public.efp_account_metadata meta ON l.user = meta.address AND l.token_id = public.convert_hex_to_bigint(meta.value);