diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06cf3e89..129ff4fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+9.1.2021
+
+- attempting to fix issue #492 - when checking for tools present in the database there were some errors in the NCC, ISO, MILL, PAINT and CUTOUT Tools
+
 8.01.2021
 
 - added the toggle button for Beginner/Advanced mode for the CNCjob, Geometry, Gerber, Excellon Objects UI (Properties Tab)
diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py
index bf51c959..dcd095a8 100644
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -1286,10 +1286,10 @@ class GeometryObject(FlatCAMObj, Geometry):
                 tool_found += 1
                 updated_tooldia = db_tooldia
                 for d in db_tool_val['data']:
-                    if d.find('tools_iso') == 0:
+                    if d.find('tools_mill_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_mill_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
diff --git a/appTools/ToolCutOut.py b/appTools/ToolCutOut.py
index 03edec38..aebdf259 100644
--- a/appTools/ToolCutOut.py
+++ b/appTools/ToolCutOut.py
@@ -521,10 +521,10 @@ class CutOut(AppTool):
             if truncated_tooldia == db_tooldia:
                 tool_found += 1
                 for d in db_tool_val['data']:
-                    if d.find('tools_cutout') == 0:
+                    if d.find('tools_cutout_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_cutout_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
@@ -533,10 +533,10 @@ class CutOut(AppTool):
                 tool_found += 1
                 updated_tooldia = db_tooldia
                 for d in db_tool_val['data']:
-                    if d.find('tools_cutout') == 0:
+                    if d.find('tools_cutout_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_cutout_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
diff --git a/appTools/ToolDrilling.py b/appTools/ToolDrilling.py
index 0b87453e..471b39cb 100644
--- a/appTools/ToolDrilling.py
+++ b/appTools/ToolDrilling.py
@@ -1050,7 +1050,7 @@ class ToolDrilling(AppTool, Excellon):
                     if orig_tooldia == db_tooldia:
                         tool_found += 1
                         for d in db_tool_val['data']:
-                            if d.find('tools_drill') == 0:
+                            if d.find('tools_drill_') == 0:
                                 new_tools_dict[orig_tool]['data'][d] = db_tool_val['data'][d]
                             elif d.find('tools_') == 0:
                                 # don't need data for other App Tools; this tests after 'tools_drill_'
@@ -1062,7 +1062,7 @@ class ToolDrilling(AppTool, Excellon):
                         tool_found += 1
                         new_tools_dict[orig_tool]['tooldia'] = db_tooldia
                         for d in db_tool_val['data']:
-                            if d.find('tools_drill') == 0:
+                            if d.find('tools_drill_') == 0:
                                 new_tools_dict[orig_tool]['data'][d] = db_tool_val['data'][d]
                             elif d.find('tools_') == 0:
                                 # don't need data for other App Tools; this tests after 'tools_drill_'
diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py
index eb244e4e..d37e6ab3 100644
--- a/appTools/ToolIsolation.py
+++ b/appTools/ToolIsolation.py
@@ -1311,10 +1311,10 @@ class ToolIsolation(AppTool, Gerber):
             if truncated_tooldia == db_tooldia:
                 tool_found += 1
                 for d in db_tool_val['data']:
-                    if d.find('tools_iso') == 0:
+                    if d.find('tools_iso_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_iso_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
@@ -1323,10 +1323,10 @@ class ToolIsolation(AppTool, Gerber):
                 tool_found += 1
                 updated_tooldia = db_tooldia
                 for d in db_tool_val['data']:
-                    if d.find('tools_iso') == 0:
+                    if d.find('tools_iso_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_iso_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
diff --git a/appTools/ToolMilling.py b/appTools/ToolMilling.py
index 9b221778..30851b99 100644
--- a/appTools/ToolMilling.py
+++ b/appTools/ToolMilling.py
@@ -1883,10 +1883,10 @@ class ToolMilling(AppTool, Excellon):
                 tool_found += 1
                 updated_tooldia = db_tooldia
                 for d in db_tool_val['data']:
-                    if d.find('tools_mill') == 0:
+                    if d.find('tools_mill_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_mill_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
diff --git a/appTools/ToolNCC.py b/appTools/ToolNCC.py
index 0ae6d956..85db8785 100644
--- a/appTools/ToolNCC.py
+++ b/appTools/ToolNCC.py
@@ -1280,10 +1280,10 @@ class NonCopperClear(AppTool, Gerber):
             if truncated_tooldia == db_tooldia:
                 tool_found += 1
                 for d in db_tool_val['data']:
-                    if d.find('tools_iso') == 0:
+                    if d.find('tools_ncc_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_ncc_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
@@ -1292,10 +1292,10 @@ class NonCopperClear(AppTool, Gerber):
                 tool_found += 1
                 updated_tooldia = db_tooldia
                 for d in db_tool_val['data']:
-                    if d.find('tools_iso') == 0:
+                    if d.find('tools_ncc_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_ncc_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
diff --git a/appTools/ToolPaint.py b/appTools/ToolPaint.py
index 4498782a..5161ccd5 100644
--- a/appTools/ToolPaint.py
+++ b/appTools/ToolPaint.py
@@ -881,10 +881,10 @@ class ToolPaint(AppTool, Gerber):
             if truncated_tooldia == db_tooldia:
                 tool_found += 1
                 for d in db_tool_val['data']:
-                    if d.find('tools_paint') == 0:
+                    if d.find('tools_paint_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_paint_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]
@@ -893,10 +893,10 @@ class ToolPaint(AppTool, Gerber):
                 tool_found += 1
                 updated_tooldia = db_tooldia
                 for d in db_tool_val['data']:
-                    if d.find('tools_paint') == 0:
+                    if d.find('tools_paint_') == 0:
                         new_tools_dict[d] = db_tool_val['data'][d]
                     elif d.find('tools_') == 0:
-                        # don't need data for other App Tools; this tests after 'tools_drill_'
+                        # don't need data for other App Tools; this tests after 'tools_paint_'
                         continue
                     else:
                         new_tools_dict[d] = db_tool_val['data'][d]