diff --git a/postgre-client/src/asset_filter_client.rs b/postgre-client/src/asset_filter_client.rs
index aa71491d..10b5c5d5 100644
--- a/postgre-client/src/asset_filter_client.rs
+++ b/postgre-client/src/asset_filter_client.rs
@@ -116,7 +116,7 @@ impl PgClient {
                     | TokenType::RegularNFT
                     | TokenType::CompressedNFT => {}
                     TokenType::All => {
-                        query_builder.push("  UNION ALL ");
+                        query_builder.push("  UNION ");
                         query_builder.push("  ( ");
                         query_builder.push(
                             "SELECT
@@ -203,20 +203,6 @@ fn add_filter_clause<'a>(
         query_builder.push(" INNER JOIN assets_authorities ON assets_v3.ast_authority_fk = assets_authorities.auth_pubkey ");
         group_clause_required = true;
     }
-    if let Some(ref token_type) = filter.token_type {
-        if token_type == &TokenType::All && filter.owner_address.is_some() {
-            query_builder.push(
-                " LEFT JOIN fungible_tokens ON assets_v3.ast_pubkey = fungible_tokens.fbt_asset ",
-            );
-            group_clause_required = true;
-        }
-        if token_type == &TokenType::Fungible && filter.owner_address.is_some() {
-            query_builder.push(
-                " INNER JOIN fungible_tokens ON assets_v3.ast_pubkey = fungible_tokens.fbt_asset ",
-            );
-            group_clause_required = true;
-        }
-    }
 
     // todo: if we implement the additional params like negata and all/any switch, the true part and the AND prefix should be refactored
     query_builder.push(" WHERE TRUE ");
@@ -296,10 +282,6 @@ fn add_filter_clause<'a>(
                 TokenType::All => {
                     query_builder.push(" AND (assets_v3.ast_owner = ");
                     query_builder.push_bind(owner_address);
-                    if !options.show_zero_balance {
-                        query_builder.push(" AND fungible_tokens.fbt_balance > ");
-                        query_builder.push_bind(0i64);
-                    }
                     query_builder.push(")");
                 }
             }