diff --git a/src/Controller/ProductCategoriesController.php b/src/Controller/ProductCategoriesController.php
index 0229d5d..f4ecc4f 100644
--- a/src/Controller/ProductCategoriesController.php
+++ b/src/Controller/ProductCategoriesController.php
@@ -161,9 +161,14 @@ class ProductCategoriesController extends AppController
                 'product_catalog_id' => $this->request->getQuery('product_catalog_id', -1),
             ],
         ]);
-        $productCategories = $productCategoriesTable
-            ->find('treeList')
-//            ->where(['product_catalog_id' => $this->request->getQuery('product_catalog_id', -1)])
+        $form = $this->request->getQuery('form', 'product_category');
+        if ($form === 'product') {
+            $productCategoriesQ = $productCategoriesTable
+                ->find('treeList', keyPath: 'name', valuePath: 'internal_id');
+        } else {
+            $productCategoriesQ = $productCategoriesTable->find('treeList');
+        }
+        $productCategories = $productCategoriesQ
             ->orderBy(['ProductCategories.name'])
             ->toArray();
 
diff --git a/src/Controller/ProductCategoryAttributesController.php b/src/Controller/ProductCategoryAttributesController.php
index d142643..20a5ae7 100644
--- a/src/Controller/ProductCategoryAttributesController.php
+++ b/src/Controller/ProductCategoryAttributesController.php
@@ -167,9 +167,9 @@ class ProductCategoryAttributesController extends AppController
         return $this->redirect(['action' => 'index']);
     }
 
-    public function form($categoryId = null)
+    public function form()
     {
-        $productCategoryAttributes = $this->getTable()->getAllCategoryAttributesForCategoryId($categoryId);
+        $productCategoryAttributes = $this->getTable()->getAllCategoryAttributesForCategoryId($this->request->getQuery('product_category_id', '-1'));
 
         $this->set(compact('productCategoryAttributes'));
     }
diff --git a/templates/element/Products/form.php b/templates/element/Products/form.php
index 815c31a..33274bf 100644
--- a/templates/element/Products/form.php
+++ b/templates/element/Products/form.php
@@ -10,6 +10,7 @@
 <h4 class="mb-4">Basic Info</h4>
 
 <?php
+echo $this->Form->hidden('form', ['value' => 'product']);
 echo $this->Form->control('name');
 echo $this->Form->control('product_catalog_id', [
         'empty' => 'Select a Catalog',