diff --git a/app/helpers/awsEmail.js b/app/helpers/awsEmail.js
index 9466698..5e2b572 100644
--- a/app/helpers/awsEmail.js
+++ b/app/helpers/awsEmail.js
@@ -2,7 +2,7 @@ const { APP_URL } = require("../config/appConfig");
 const { getRealEstateTypeEnum } = require("./enums");
 const { getRegionName, getMunicipalityName } = require("./codes");
 const { allRERequestByUiid } = require("./db/dbHelper");
-var AWS = require("aws-sdk");
+let AWS = require("aws-sdk");
 const TEMPLATE_NAME = "MarketAlertTemplate";
 
 AWS.config.update({
@@ -30,16 +30,12 @@ const sendTemplatedEmail = async (email, request) => {
         },
         Text: {
           Charset: "UTF-8",
-          Data: getGreetingsEmaiTextVersion(request)
+          Data: getGreetingsEmailTextVersion(request)
         }
       },
       Subject: {
         Charset: "UTF-8",
-        Data: `Javimi Potvrda: ${getSubject(
-          request.realEstateType,
-          request.region,
-          request.municipality
-        )}`
+        Data: `Javimi Potvrda: ${getSubject(request.realEstateType)}`
       }
     },
     Source: process.env.SOURCE_EMAIL /* required */,
@@ -52,12 +48,12 @@ const sendTemplatedEmail = async (email, request) => {
   await sendEmailPromise;
 };
 
-const getGreetingsEmailHTML = realestateRequest => {
+const getGreetingsEmailHTML = realEstateRequest => {
   const realEstateType = getRealEstateTypeEnum(
-    realestateRequest.realEstateType
+    realEstateRequest.realEstateType
   );
   const gardenSize = realEstateType.hasGardenSize
-    ? `<div><strong>Kvadratura okućnice: Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2  </strong></div>`
+    ? `<div><strong>Kvadratura okućnice: Od ${realEstateRequest.gardenSizeMin} do ${realEstateRequest.gardenSizeMax} m2  </strong></div>`
     : ``;
 
   return `<h1> Zdravo, 
@@ -65,63 +61,40 @@ const getGreetingsEmailHTML = realestateRequest => {
   <h2> Ovo je tražena nekretnina:  </h2> 
   <div>
   <div> <strong>Tip nekretnine: ${realEstateType.title} </strong></div>
-  <div><strong>Područje: ${getRegionName(
-    realestateRequest.region
-  )} </strong></div>
-  <div><strong>Mjesto: ${getMunicipalityName(
-    realestateRequest.region,
-    realestateRequest.municipality
-  )} </strong></div>
-  <div><strong>Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${
-    realestateRequest.sizeMax
-  } m2  </strong></div>
+  <div><strong>Lokacija:  </strong></div>
+  <div><strong>Kvadratura nekretnine: Od ${realEstateRequest.sizeMin} do ${realEstateRequest.sizeMax} m2  </strong></div>
   ${gardenSize}
-  <div><strong>Cijena: ${realestateRequest.priceMin} do ${
-    realestateRequest.priceMax
-  } KM  </strong></div>
+  <div><strong>Cijena: ${realEstateRequest.priceMin} do ${realEstateRequest.priceMax} KM  </strong></div>
   </div>
   <div> 
 
   </div>
-  <div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${APP_URL}/odjava/${
-    realestateRequest.uniqueId
-  } </strong></div>
-  <div><strong>Ako želiš promijeniti uslove pretrage klikni  ${APP_URL}/pregled/${
-    realestateRequest.uniqueId
-  } </strong></div>
+  <div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${APP_URL}/odjava/${realEstateRequest.uniqueId} </strong></div>
+  <div><strong>Ako želiš promijeniti uslove pretrage klikni  ${APP_URL}/pregled/${realEstateRequest.uniqueId} </strong></div>
     <h4> Tvoj,
     Javimi tim.  
     </h4>`;
 };
 
-const getGreetingsEmaiTextVersion = realestateRequest => {
+const getGreetingsEmailTextVersion = realEstateRequest => {
   const realEstateType = getRealEstateTypeEnum(
-    realestateRequest.realEstateType
+    realEstateRequest.realEstateType
   );
   const gardenSize = realEstateType.hasGardenSize
-    ? `Kvadratura okućnice od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax}`
+    ? `Kvadratura okućnice od ${realEstateRequest.gardenSizeMin} do ${realEstateRequest.gardenSizeMax}`
     : "";
 
-  const text = `Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima 
-  \n Ovo je tražena nekretnina: \n , Tip nekretnine: ${
-    realestateRequest.realEstateType
-  } \n Područje ${getRegionName(
-    realestateRequest.region
-  )} \n Mjesto ${getMunicipalityName(
-    realestateRequest.region,
-    realestateRequest.municipality
-  )}
-    \n Kvadratura nekretnine Od ${realestateRequest.sizeMin} do ${
-    realestateRequest.sizeMaX
-  } ${gardenSize} \n Cijena od ${realestateRequest.priceMin} do ${
-    realestateRequest.priceMax
-  } \n Ako želis prestati dobijati obavještenja za ovu pretragu klikni
-    ${APP_URL}/odjava/${
-    realestateRequest.uniqueId
-  }\n Ako želiš promijeniti uslove pretrage klikni
-    ${APP_URL}/odpregled/${realestateRequest.uniqueId}\n Tvoj,\n Javimi tim`;
-
-  return text;
+  return `Zdravo\nNaručio/la si da ti javimo ako se nekretnina pojavi u oglasima\n
+  Ovo je tražena nekretnina:\nTip nekretnine: ${realEstateRequest.realEstateType}\n
+  Lokacija nekretnine :\n
+  Kvadratura nekretnine Od ${realEstateRequest.sizeMin} do ${realEstateRequest.sizeMax} 
+  ${gardenSize}\n
+  Cijena od ${realEstateRequest.priceMin} do ${realEstateRequest.priceMax} \n 
+  Ako želis prestati dobijati obavještenja za ovu pretragu klikni
+    ${APP_URL}/odjava/${realEstateRequest.uniqueId}\n 
+  Ako želiš promijeniti uslove pretrage klikni
+    ${APP_URL}/odpregled/${realEstateRequest.uniqueId}\n 
+   Tvoj,\n Javimi tim`;
 };
 
 const sendBulkEmail = async marketAlerts => {
@@ -249,8 +222,7 @@ const createMarketAlertEmailTemplate = async () => {
   const marketAlertTemplate = {
     Template: {
       TemplateName: TEMPLATE_NAME,
-      SubjectPart:
-        "Javi mi obavijest: {{realestateType}}, {{region}}, {{municipality}}",
+      SubjectPart: "Javi mi obavijest: {{realestateType}}",
       TextPart: getNotificationEmailText(),
       HtmlPart: getNotificationEmailHtml()
     }
@@ -266,10 +238,8 @@ const createMarketAlertEmailTemplate = async () => {
   }
 };
 
-const getSubject = (realEstateType, region, municipality) => {
-  return `${getRealEstateTypeEnum(realEstateType).title} ${getRegionName(
-    region
-  )}, ${getMunicipalityName(region, municipality)}`;
+const getSubject = realEstateType => {
+  return getRealEstateTypeEnum(realEstateType).title;
 };
 
 module.exports = {