diff --git a/app/controllers/querySubmit.js b/app/controllers/querySubmit.js
index de48eba..4564b23 100644
--- a/app/controllers/querySubmit.js
+++ b/app/controllers/querySubmit.js
@@ -1,4 +1,4 @@
-const { currentRERequest } = require("../helpers/url");
+const { currentSearchRequest } = require("../helpers/url");
 const { isValidEmail } = require("../helpers/email");
 const { sendTemplatedEmail } = require("../helpers/awsEmail");
 
@@ -15,21 +15,13 @@ const getQuerySubmit = async (req, res) => {
 };
 
 const postQuerySubmit = async (req, res) => {
-  const request = await currentRERequest(req);
+  const searchRequest = await currentSearchRequest(req);
   const nextStep = req.query.nextStep || "/ponovo";
 
   const emailInput = req.body.email;
   const emailConfirmInput = req.body.confirm;
   let error = "Greška ! Unesite validan email";
 
-  if (!isValidEmail(emailInput) || !isValidEmail(emailConfirmInput)) {
-    error = "Greška ! Unesite validan email";
-    res.render("querySubmit", {
-      error
-    });
-    return;
-  }
-
   if (emailInput !== emailConfirmInput) {
     error = "Greška ! Unešeni emailovi nisu isti";
     res.render("querySubmit", {
@@ -38,10 +30,19 @@ const postQuerySubmit = async (req, res) => {
     return;
   }
 
-  request.email = req.body.email;
-  request.subscribed = true;
-  await request.save();
-  sendTemplatedEmail(req.body.email, request);
+  if (!isValidEmail(emailInput)) {
+    error = "Greška ! Unesite validan email";
+    res.render("querySubmit", {
+      error
+    });
+    return;
+  }
+
+  searchRequest.email = emailInput;
+  searchRequest.subscribed = true;
+  await searchRequest.save();
+
+  sendTemplatedEmail(req.body.email, searchRequest);
   res.redirect(nextStep);
 };