diff --git a/apps/api/src/app/catalog/catalog.service.ts b/apps/api/src/app/catalog/catalog.service.ts
index 878ebe7..408d9c3 100644
--- a/apps/api/src/app/catalog/catalog.service.ts
+++ b/apps/api/src/app/catalog/catalog.service.ts
@@ -84,16 +84,16 @@ export class CatalogService {
              TRIM(e.nome)         AS nome_fantasia,
              TRIM(e.cnpj)         AS cnpj,
              TRIM(e.inscr_estadual) AS inscr_estadual,
-             TRIM(e.endereco)     AS endereco,
-             NULLIF(e.numero, 0)::text AS numero,
-             NULLIF(TRIM(e.complemento), '.') AS complemento,
-             TRIM(e.bairro)       AS bairro,
-             TRIM(m.nome)         AS cidade,
-             TRIM(e.estado::text) AS uf,
-             TRIM(e.cep::text)    AS cep,
-             TRIM(e.telefone::text) AS telefone,
-             TRIM(e.email)        AS email
-      FROM gestao.empresa e
+             TRIM(e.endereco)       AS endereco,
+             e.num_endereco::text   AS numero,
+             e.complemento,
+             TRIM(e.bairro)         AS bairro,
+             TRIM(m.nome)           AS cidade,
+             TRIM(e.uf)             AS uf,
+             e.cep,
+             e.telefone,
+             TRIM(e.email)          AS email
+      FROM sar.vw_empresas e
       LEFT JOIN sar.vw_municipios m ON m.id_municipio = e.id_municipio
       WHERE e.id_empresa = ${idEmpresa}
       LIMIT 1
diff --git a/apps/api/src/app/clients/clients.service.ts b/apps/api/src/app/clients/clients.service.ts
index 06aae2d..af03018 100644
--- a/apps/api/src/app/clients/clients.service.ts
+++ b/apps/api/src/app/clients/clients.service.ts
@@ -475,7 +475,7 @@ export class ClientsService {
       WHERE ped.id_cliente   = ${idCliente}
         AND ped.id_empresa   = ${idEmpresa}
         AND ped.situa       NOT IN (5)
-      GROUP BY i.id_produto, p.descricao, p.unidade, ped.id_cliente
+      GROUP BY i.id_produto, p.codigo, p.descricao, p.unidade, ped.id_cliente
       ORDER BY SUM(i.qtd) DESC
       LIMIT ${limit}
     `);