diff --git a/military-symbology-styles/test-data/app6b/gdbs/ComprehensiveTestData.gdb.zip b/military-symbology-styles/test-data/app6b/gdbs/ComprehensiveTestData.gdb.zip
index e52ce66..f28b8ba 100644
Binary files a/military-symbology-styles/test-data/app6b/gdbs/ComprehensiveTestData.gdb.zip and b/military-symbology-styles/test-data/app6b/gdbs/ComprehensiveTestData.gdb.zip differ
diff --git a/military-symbology-styles/test-data/app6b/pro-projects/App6bComprehensiveTestData.ppkx b/military-symbology-styles/test-data/app6b/pro-projects/App6bComprehensiveTestData.ppkx
index b3ee34e..fec817a 100644
Binary files a/military-symbology-styles/test-data/app6b/pro-projects/App6bComprehensiveTestData.ppkx and b/military-symbology-styles/test-data/app6b/pro-projects/App6bComprehensiveTestData.ppkx differ
diff --git a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-AreasOnly.csv b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-AreasOnly.csv
index a370039..698ce69 100644
--- a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-AreasOnly.csv
+++ b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-AreasOnly.csv
@@ -1,4 +1,4 @@
-OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
+Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 1,E,Friend,GFCPMGAUAF-----,G F C P MG AU AF -- -- -,2.X.2.1.1.3.1.1.1,FRIENDLY,AREA,
 2,E,Friend,GFCPMGAUAP-----,G F C P MG AU AP -- -- -,2.X.2.1.1.3.1.1.2,FRIENDLY PLANNED/ON ORDER,AREA,
 3,E,Hostile,GHCPMGAUAE-----,G H C P MG AU AE -- -- -,2.X.2.1.1.3.1.1.3,ENEMY KNOWN/CONFIRMED,AREA,
diff --git a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-LinesOnly.csv b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-LinesOnly.csv
index 5b33091..383b9a6 100644
--- a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-LinesOnly.csv
+++ b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-LinesOnly.csv
@@ -1,4 +1,4 @@
-OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
+Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 1,E,Friend,GFTPGB---------,G F T P GB -- -- -- -- -,2.X.1.1.1,BLOCK,LINE,
 2,E,Friend,GFTPGH---------,G F T P GH -- -- -- -- -,2.X.1.1.2,BREACH,LINE,
 3,E,Friend,GFTPGY---------,G F T P GY -- -- -- -- -,2.X.1.1.3,BYPASS,LINE,
@@ -137,13 +137,14 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 136,E,Friend,GFCPSLRW-------,G F C P SL RW -- -- -- -,2.X.2.4.2.2.5,TWO-WAY TRAFFIC,LINE,
 137,E,Friend,GFCPOLN--------,G F C P OL N- -- -- -- -,2.X.2.5.3.1,LIGHT LINE,LINE,
 138,E,Friend,GFCPOLP--------,G F C P OL P- -- -- -- -,2.X.2.5.3.2,PHASE LINE,LINE,
-139,F,N/A,W-A-PFC--------,W - A - PF C- -- -- -- -,3.X.1.3.1,COLD FRONT,LINE,
-140,F,N/A,W-A-PFCU-------,W - A - PF CU -- -- -- -,3.X.1.3.1.1,UPPER COLD FRONT,LINE,
-141,F,N/A,W-A-PFW--------,W - A - PF W- -- -- -- -,3.X.1.3.2,WARM FRONT,LINE,
-142,F,N/A,W-A-PFWU-------,W - A - PF WU -- -- -- -,3.X.1.3.2.1,UPPER WARM FRONT,LINE,
-143,F,N/A,W-A-PFO--------,W - A - PF O- -- -- -- -,3.X.1.3.3,OCCLUDED FRONT,LINE,
-144,F,N/A,W-A-PFS--------,W - A - PF S- -- -- -- -,3.X.1.3.4,STATIONARY FRONT,LINE,
-145,F,N/A,W-A-PXT--------,W - A - PX T- -- -- -- -,3.X.1.4.1,TROUGH LINE,LINE,
-146,F,N/A,W-A-PXR--------,W - A - PX R- -- -- -- -,3.X.1.4.2,RIDGE LINE,LINE,
-147,F,N/A,W-A-PXS--------,W - A - PX S- -- -- -- -,3.X.1.4.3,SQUALL LINE,LINE,
-148,F,N/A,W-A-WJ---------,W - A - WJ -- -- -- -- -,3.X.4.1,JET STREAM,LINE,
+139,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,LINE,
+140,F,N/A,W-A-PFC--------,W - A - PF C- -- -- -- -,3.X.1.3.1,COLD FRONT,LINE,
+141,F,N/A,W-A-PFCU-------,W - A - PF CU -- -- -- -,3.X.1.3.1.1,UPPER COLD FRONT,LINE,
+142,F,N/A,W-A-PFW--------,W - A - PF W- -- -- -- -,3.X.1.3.2,WARM FRONT,LINE,
+143,F,N/A,W-A-PFWU-------,W - A - PF WU -- -- -- -,3.X.1.3.2.1,UPPER WARM FRONT,LINE,
+144,F,N/A,W-A-PFO--------,W - A - PF O- -- -- -- -,3.X.1.3.3,OCCLUDED FRONT,LINE,
+145,F,N/A,W-A-PFS--------,W - A - PF S- -- -- -- -,3.X.1.3.4,STATIONARY FRONT,LINE,
+146,F,N/A,W-A-PXT--------,W - A - PX T- -- -- -- -,3.X.1.4.1,TROUGH LINE,LINE,
+147,F,N/A,W-A-PXR--------,W - A - PX R- -- -- -- -,3.X.1.4.2,RIDGE LINE,LINE,
+148,F,N/A,W-A-PXS--------,W - A - PX S- -- -- -- -,3.X.1.4.3,SQUALL LINE,LINE,
+149,F,N/A,W-A-WJ---------,W - A - WJ -- -- -- -- -,3.X.4.1,JET STREAM,LINE,
diff --git a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-PointsOnly.csv b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-PointsOnly.csv
index b6799ad..c080a1e 100644
--- a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-PointsOnly.csv
+++ b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-PointsOnly.csv
@@ -1,4 +1,4 @@
-OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
+Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 1,D,Friend,SFP------------,S F P - -- -- -- -- -- -,1.X.1 ,SPACE TRACK,POINT,
 2,D,Friend,SFP-S----------,S F P - S- -- -- -- -- -,1.X.1.1 ,SATELLITE,POINT,
 3,D,Friend,SFP-V----------,S F P - V- -- -- -- -- -,1.X.1.2 ,CREWED SPACE VEHICLE,POINT,
@@ -758,7 +758,6 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 757,E,Friend,GFCPBYCG-------,G F C P BY CG -- -- -- -,2.X.2.2.2.2.8,ENGINEER REGULATING POINT,POINT,
 758,E,Friend,GFCPBSE--------,G F C P BS E- -- -- -- -,2.X.2.2.3.1,EARTHWORK SMALL TRENCH OR FORTIFICATION ,POINT,
 759,E,Friend,GFCPBSF--------,G F C P BS F- -- -- -- -,2.X.2.2.3.2,FORT,POINT,
-760,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,POINT,
 761,E,Friend,GFCPBSH--------,G F C P BS H- -- -- -- -,2.X.2.2.3.6,SURFACE SHELTER,POINT,
 762,E,Friend,GFCPBSU--------,G F C P BS U- -- -- -- -,2.X.2.2.3.7,UNDERGROUND SHELTER,POINT,
 763,E,Friend,GFCPBWM--------,G F C P BW M- -- -- -- -,2.X.2.2.4.1,MINIMUM SAFE DISTANCE ZONES,POINT,
diff --git a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv
index 5078fd6..fb7dc0c 100644
--- a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv
+++ b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv
@@ -1,4 +1,4 @@
-OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
+Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 1,D,Friend,SF-------------,S F - - -- -- -- -- -- -,1.X ,WARFIGHTING SYMBOLS,NO_SYMBOL,
 2,D,Friend,SFP------------,S F P - -- -- -- -- -- -,1.X.1 ,SPACE TRACK,POINT,
 3,D,Friend,SFP-S----------,S F P - S- -- -- -- -- -,1.X.1.1 ,SATELLITE,POINT,
@@ -996,7 +996,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
 996,E,Friend,GFCPBSE--------,G F C P BS E- -- -- -- -,2.X.2.2.3.1,EARTHWORK SMALL TRENCH OR FORTIFICATION ,POINT,
 997,E,Friend,GFCPBSF--------,G F C P BS F- -- -- -- -,2.X.2.2.3.2,FORT,POINT,
 998,E,Friend,GFCPBSL--------,G F C P BS L- -- -- -- -,2.X.2.2.3.3,FORTIFIED LINE,LINE,
-999,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,POINT,
+999,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,LINE,
 1000,E,Friend,GFCPBSP--------,G F C P BS P- -- -- -- -,2.X.2.2.3.5,STRONG POINT,AREA,
 1001,E,Friend,GFCPBSH--------,G F C P BS H- -- -- -- -,2.X.2.2.3.6,SURFACE SHELTER,POINT,
 1002,E,Friend,GFCPBSU--------,G F C P BS U- -- -- -- -,2.X.2.2.3.7,UNDERGROUND SHELTER,POINT,