diff --git a/computers.asp b/computers.asp
index a7c7a58..708ca31 100644
--- a/computers.asp
+++ b/computers.asp
@@ -156,7 +156,7 @@ Set rsStatus = Nothing
 		whereClause = whereClause & "AND (models.modelnumber LIKE '%OptiPlex%' OR models.modelnumber LIKE '%Tower%' OR models.modelnumber LIKE '%Micro%') "
 	End If
 
-	strSQL = strSQL & whereClause & "GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
+	strSQL = strSQL & whereClause & " GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
 
 	set rs = objconn.Execute(strSQL)
 	while not rs.eof
diff --git a/displaypcs.asp b/displaypcs.asp
index d16ef73..2f7a862 100644
--- a/displaypcs.asp
+++ b/displaypcs.asp
@@ -166,7 +166,7 @@ Set rsStatus = Nothing
 		              "AND NOT EXISTS (SELECT 1 FROM machinerelationships mr WHERE (mr.machineid = m.machineid OR mr.related_machineid = m.machineid) AND mr.relationshiptypeid = 3 AND mr.isactive = 1) "
 	End If
 
-	strSQL = strSQL & whereClause & "GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
+	strSQL = strSQL & whereClause & " GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
 
 	set rs = objconn.Execute(strSQL)
 	while not rs.eof
diff --git a/editdevice.asp b/editdevice.asp
index ba0ce9c..6125ba4 100644
--- a/editdevice.asp
+++ b/editdevice.asp
@@ -54,7 +54,7 @@
 	End If
 
 	' Store machine data
-	Dim serialnumber, hostname, machinenumber, modelid, businessunitid, alias, machinenotes, mapleft, maptop
+	Dim serialnumber, hostname, machinenumber, modelid, businessunitid, alias, machinenotes, mapleft, maptop, currentPctypeid
 	serialnumber = "" : If NOT IsNull(rsMachine("serialnumber")) Then serialnumber = rsMachine("serialnumber") & ""
 	hostname = "" : If NOT IsNull(rsMachine("hostname")) Then hostname = rsMachine("hostname") & ""
 	machinenumber = "" : If NOT IsNull(rsMachine("machinenumber")) Then machinenumber = rsMachine("machinenumber") & ""
@@ -64,6 +64,7 @@
 	machinenotes = "" : If NOT IsNull(rsMachine("machinenotes")) Then machinenotes = rsMachine("machinenotes") & ""
 	mapleft = "" : If NOT IsNull(rsMachine("mapleft")) Then mapleft = rsMachine("mapleft")
 	maptop = "" : If NOT IsNull(rsMachine("maptop")) Then maptop = rsMachine("maptop")
+	currentPctypeid = "" : If NOT IsNull(rsMachine("pctypeid")) Then currentPctypeid = rsMachine("pctypeid")
 
 	rsMachine.Close
 	Set rsMachine = Nothing
@@ -566,8 +567,14 @@
                       <select class="form-control" id="controllingpc" name="controllingpc">
                         <option value="">-- None --</option>
 <%
-	Dim rsControlPCs
-	strSQL = "SELECT machineid, machinenumber, alias FROM machines WHERE pctypeid IS NULL AND isactive = 1 ORDER BY machinenumber ASC"
+	Dim rsControlPCs, equipmentFilter
+	' Filter equipment dropdown based on PC type
+	' CMM PCs (pctypeid 5) should only see CMM equipment (machinetypeid 3)
+	equipmentFilter = ""
+	If currentPctypeid = 5 Then
+		equipmentFilter = " AND machinetypeid = 3"
+	End If
+	strSQL = "SELECT machineid, machinenumber, alias FROM machines WHERE pctypeid IS NULL AND isactive = 1" & equipmentFilter & " ORDER BY machinenumber ASC"
 	Set rsControlPCs = objconn.Execute(strSQL)
 	While Not rsControlPCs.EOF
 		Dim controlPCDisplay, selectedControlPC
diff --git a/listpcs.asp b/listpcs.asp
index 6dcf67d..a00cdeb 100644
--- a/listpcs.asp
+++ b/listpcs.asp
@@ -156,7 +156,7 @@ Set rsStatus = Nothing
 		whereClause = whereClause & "AND (models.modelnumber LIKE '%OptiPlex%' OR models.modelnumber LIKE '%Tower%' OR models.modelnumber LIKE '%Micro%') "
 	End If
 
-	strSQL = strSQL & whereClause & "GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
+	strSQL = strSQL & whereClause & " GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
 
 	set rs = objconn.Execute(strSQL)
 	while not rs.eof
diff --git a/pclist.asp b/pclist.asp
index f3135fe..026afb1 100644
--- a/pclist.asp
+++ b/pclist.asp
@@ -156,7 +156,7 @@ Set rsStatus = Nothing
 		whereClause = whereClause & "AND (models.modelnumber LIKE '%OptiPlex%' OR models.modelnumber LIKE '%Tower%' OR models.modelnumber LIKE '%Micro%') "
 	End If
 
-	strSQL = strSQL & whereClause & "GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
+	strSQL = strSQL & whereClause & " GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
 
 	set rs = objconn.Execute(strSQL)
 	while not rs.eof
diff --git a/pcs.asp b/pcs.asp
index 6dcf67d..a00cdeb 100644
--- a/pcs.asp
+++ b/pcs.asp
@@ -156,7 +156,7 @@ Set rsStatus = Nothing
 		whereClause = whereClause & "AND (models.modelnumber LIKE '%OptiPlex%' OR models.modelnumber LIKE '%Tower%' OR models.modelnumber LIKE '%Micro%') "
 	End If
 
-	strSQL = strSQL & whereClause & "GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
+	strSQL = strSQL & whereClause & " GROUP BY m.machineid ORDER BY m.machinenumber ASC, m.hostname ASC"
 
 	set rs = objconn.Execute(strSQL)
 	while not rs.eof