diff --git a/package-lock.json b/package-lock.json
index 57e8b6ad0..f6788e385 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1248,9 +1248,9 @@
       }
     },
     "@qawolf/sandbox": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/@qawolf/sandbox/-/sandbox-0.1.15.tgz",
-      "integrity": "sha512-b2JV8BFh+IxuR9/AC9w47z6BfOKrB3suJPKnB5WBo0wOnXu5fjBh3502q4o3T3cvkc/eDAPxSZqd5fUo6g3/ig==",
+      "version": "0.1.16",
+      "resolved": "https://registry.npmjs.org/@qawolf/sandbox/-/sandbox-0.1.16.tgz",
+      "integrity": "sha512-+d9RIOkFHqLFsZvaeyabsV5Z3qnxkfwtOefWL5OXMfPENxU7pzfXUHrKBJ54Ubc2uZwyYnNoDWIvJy3fA/ON6A==",
       "dev": true,
       "requires": {
         "serve": "^11.3.0"
diff --git a/package.json b/package.json
index 5d9797960..31444f6de 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.0.20",
-    "@qawolf/sandbox": "0.1.15",
+    "@qawolf/sandbox": "0.1.16",
     "@types/debug": "^4.1.5",
     "@types/fs-extra": "^9.0.1",
     "@types/glob": "^7.1.3",
diff --git a/packages/sandbox/package-lock.json b/packages/sandbox/package-lock.json
index 35a40f584..513b86a8d 100644
--- a/packages/sandbox/package-lock.json
+++ b/packages/sandbox/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@qawolf/sandbox",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
index 79e49001f..da9bc8547 100644
--- a/packages/sandbox/package.json
+++ b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qawolf/sandbox",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "files": [
     "bin",
     "build"
diff --git a/packages/sandbox/src/pages/Buttons/HtmlButtons.js b/packages/sandbox/src/pages/Buttons/HtmlButtons.js
index 2540b853d..e321b1fc9 100644
--- a/packages/sandbox/src/pages/Buttons/HtmlButtons.js
+++ b/packages/sandbox/src/pages/Buttons/HtmlButtons.js
@@ -23,10 +23,10 @@ function HtmlButtons() {
       <button id="whitespace-button">{'     I have extra whitespace  '}</button>
       <br />
       <br />
-      <button className="btn-a btn-1">Classes</button>
-      <button className="btn-a btn-2">Classes</button>
-      <button className="btn-b btn-1">Classes</button>
-      <button className="btn-b btn-2">Classes</button>
+      <button className="first-half type-one">Classes</button>
+      <button className="first-half type-two">Classes</button>
+      <button className="second-half type-one">Classes</button>
+      <button className="second-half type-two">Classes</button>
       <br />
       <br />
       <button id="nested">
diff --git a/src/web/isDynamic.ts b/src/web/isDynamic.ts
index f0856b090..e41d2d9d0 100644
--- a/src/web/isDynamic.ts
+++ b/src/web/isDynamic.ts
@@ -37,12 +37,8 @@ const SCORE_THRESHOLD = 0.5;
 export const getTokens = (value: string): string[] => {
   const tokens = [];
 
-  // remove a numeric or alphabetic suffix
-  // ex: btn-1, btn_z -> btn
-  const symbol = value.replace(/[-_]+(\d+|\w)$/, '');
-
   // split by space, dash, and camel case
-  symbol.split(/[ \-_]+|(?=[A-Z])/).forEach((token) => {
+  value.split(/[ \-_]+|(?=[A-Z])/).forEach((token) => {
     if (!token) return; // ignore empty string
 
     tokens.push(token.toLowerCase());
diff --git a/test/web/isDynamic.test.ts b/test/web/isDynamic.test.ts
index 132c85d13..39c5c51fc 100644
--- a/test/web/isDynamic.test.ts
+++ b/test/web/isDynamic.test.ts
@@ -9,6 +9,7 @@ describe('isDynamic', () => {
     'gLFyf',
     'intercom-123v9c3',
     'StyledBox-sc-13pk1d4-0',
+    'StyledLayer-rmtehz-0',
     'TSPr2b',
     'u_0_b',
   ])('is dynamic: %s', (example) => {
@@ -19,7 +20,6 @@ describe('isDynamic', () => {
     'app',
     'b-content__page-input',
     'btn',
-    'btn-b',
     'btn-playr-primary',
     'central-textlogo__image',
     'col-sm-12',
diff --git a/test/web/selector.test.ts b/test/web/selector.test.ts
index 95d594937..c5578c0b1 100644
--- a/test/web/selector.test.ts
+++ b/test/web/selector.test.ts
@@ -100,7 +100,7 @@ describe('buildSelector', () => {
         // selects the ancestor
         [['#html-button-child', '[data-qa="html-button-with-children"]']],
         [['.MuiButton-label', '[data-qa="material-button"]']],
-        ['.btn-b.btn-2'],
+        ['.second-half.type-two'],
       ])('builds expected selector %o', (selector) => expectSelector(selector));
     });
 
@@ -224,7 +224,7 @@ describe('buildSelector', () => {
         [['#button', '[data-test="click"] [data-qa="button"]']],
         // unique selectors
         [['#unique', '[data-qa="unique"]']],
-        [['#dog-0', '[data-qa="radio-group"] #dog-0']],
+        [['#dog-0', '[data-qa="radio-group"] [value="dog-0"]']],
       ])('builds expected selector %o', (selector) => expectSelector(selector));
     });