diff --git a/server/src/server.ts b/server/src/server.ts
index dfe854602b93b4c233d444e96ac57bc36be3d585..ecd6b936d1dd571c3a04c72a81b89f401e181ea8 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -91,21 +91,13 @@ function getQuery(key: string, value: string){
 // builds specialized query for searching with filtering
 function getSearchQuery(title: string, genre: string, order: boolean): string {
     let query = 'SELECT * FROM movie'
-    if (title != '') {
-        query = query + ' WHERE title LIKE "%' + title + '%"'
-    }
-    if (title != '' && genre != '') {
-        query = query + ' AND'
-    }
-    if (title == '' && genre != '') {
-        query = query + ' WHERE'
-    }
-    if (genre != '') {
-        query = query +  ' genre LIKE "%' + genre + '%"'
-    }
-    if (order) {
-        query = query + ' ORDER BY year DESC'
-    }
+    
+    if (title != '') { query += ' WHERE title LIKE "%' + title + '%"' }
+    if (title != '' && genre != '') { query += ' AND' }
+    if (title == '' && genre != '') { query += ' WHERE' }
+    if (genre != '') { query += ' genre LIKE "%' + genre + '%"' }
+    if (order) { query += ' ORDER BY year DESC' }
+
     console.log(query)
     return query
 }