diff --git a/lattice/src/App/Query/QueryContainer.tsx b/lattice/src/App/Query/QueryContainer.tsx
index bd1a41791..7c102509c 100644
--- a/lattice/src/App/Query/QueryContainer.tsx
+++ b/lattice/src/App/Query/QueryContainer.tsx
@@ -110,7 +110,19 @@ export const QueryContainer: FC<{}> = () => {
           setLoading(false);
         }
       } else {
-        querySQL(query, handleQueryMessages, handleQueryEnd);
+        let queryArr = query.split(' ');
+        queryArr.forEach((word, idx) => {
+          if (word.includes('-')) {
+            let wordArr = word.split('.');
+            wordArr.forEach((section, idx) => {
+              if(section.includes('-') && !word.includes('`')) {
+                wordArr[idx] = `\`${wordArr[idx]}\``;
+              }
+            })
+            queryArr[idx] = wordArr.join('.');
+          }
+        });
+        querySQL(queryArr.join(' '), handleQueryMessages, handleQueryEnd);
       }
     }
   };