diff --git a/pages/api/domains.ts b/pages/api/domains.ts
index 2cef821..e37483f 100644
--- a/pages/api/domains.ts
+++ b/pages/api/domains.ts
@@ -61,8 +61,8 @@ export const addDomain = async (req: NextApiRequest, res: NextApiResponse<Domain
    }
    const { domain } = req.body || {};
    const domainData = {
-      domain,
-      slug: domain.replaceAll('.', '-'),
+      domain: domain.trim(),
+      slug: domain.trim().replaceAll('-', '_').replaceAll('.', '-'),
       lastUpdated: new Date().toJSON(),
       added: new Date().toJSON(),
    };
diff --git a/pages/api/keywords.ts b/pages/api/keywords.ts
index 3199673..13ea134 100644
--- a/pages/api/keywords.ts
+++ b/pages/api/keywords.ts
@@ -44,7 +44,7 @@ const getKeywords = async (req: NextApiRequest, res: NextApiResponse<KeywordsGet
    if (!req.query.domain && typeof req.query.domain !== 'string') {
       return res.status(400).json({ error: 'Domain is Required!' });
    }
-   const domain = (req.query.domain as string).replaceAll('-', '.');
+   const domain = (req.query.domain as string).replaceAll('-', '.').replaceAll('_', '-');
 
    try {
       const allKeywords:Keyword[] = await Keyword.findAll({ where: { domain } });