diff --git a/backend/src/main/java/org/bffl/controller/MainController.java b/backend/src/main/java/org/bffl/controller/MainController.java
index 1f17720..81eb86c 100644
--- a/backend/src/main/java/org/bffl/controller/MainController.java
+++ b/backend/src/main/java/org/bffl/controller/MainController.java
@@ -170,8 +170,10 @@ public int insertNewShortURLWithTarget(@RequestBody POST_ShortURLWithTargetAndTa
         }
 
         for(int tagId: assignedTagIds){
-            if(this.url_has_tagRepo.saveTagOfGroupToShortURLBySuffix(tagId, body.getGroup_name(), body.getCustom_suffix()) != 1)
+            String suffix = body.getCustom_suffix();
+            if(this.url_has_tagRepo.saveTagOfGroupToShortURLBySuffix(tagId, body.getGroup_name(), suffix) != 1) {
                 return HttpStatus.BAD_REQUEST.value();
+            }
         }
 
         return HttpStatus.CREATED.value();
diff --git a/backend/src/main/java/org/bffl/dbConnector/dao/repos/Url_has_tagRepo.java b/backend/src/main/java/org/bffl/dbConnector/dao/repos/Url_has_tagRepo.java
index c08a1b8..0cd94ef 100644
--- a/backend/src/main/java/org/bffl/dbConnector/dao/repos/Url_has_tagRepo.java
+++ b/backend/src/main/java/org/bffl/dbConnector/dao/repos/Url_has_tagRepo.java
@@ -33,7 +33,7 @@ public interface Url_has_tagRepo extends JpaRepository<Url_has_tag, Composite_ur
             "VALUES ((" +
                     "SELECT id " +
                     "FROM short_url " +
-                    "WHERE group_name = :searched_group_name AND custom_suffix = :searched_custom_suffix;" +
+                    "WHERE group_name = :searched_group_name AND custom_suffix = :searched_custom_suffix" +
             "), (" +
                     "SELECT id " +
                     "FROM tag " +