diff --git a/ChangeLog b/ChangeLog
index 6a11a32a..f5201c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14450,6 +14450,12 @@
 2014-09-11 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a regression in 'liob/rdreport.cpp' that broke report
 	generation.
-2014-09-11 Fred Gleason <fredg@paravelsystems.com>
+2014-09-12 Fred Gleason <fredg@paravelsystems.com>
 	* Updated 'NEWS'.
 	* Incremented the package version to 2.9.2.
+2014-09-13 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in 'rdadmin/edit_decks.cpp' that caused the incorrect
+	switcher matrix value to be loaded when selecting a new switcher
+	host.
+	* Fixed a bug in 'rdadmin/edit_decks.cpp' that caused spurious
+	entries to appear in the list of available matrix output sources.
diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp
index 2b911dec..841e1563 100644
--- a/rdadmin/edit_decks.cpp
+++ b/rdadmin/edit_decks.cpp
@@ -428,7 +428,11 @@ void EditDecks::stationActivatedData(const QString &str)
 
   edit_swmatrix_box->clear();
   edit_swmatrix_box->insertStringList(GetActiveOutputMatrices());
-
+  for(unsigned i=0;i<edit_matrix_ids.size();i++) {
+    if(edit_matrix_ids[i]==edit_record_deck->switchMatrix()) {
+      edit_swmatrix_box->setCurrentItem(i);
+    }
+  }
   matrixActivatedData(edit_swmatrix_box->currentText());
 }
 
@@ -457,10 +461,11 @@ void EditDecks::matrixActivatedData(const QString &str)
     return;
   }
   int matrix=edit_matrix_ids[edit_swmatrix_box->currentItem()];
-  sql=QString().sprintf("select NAME from OUTPUTS where \
-                         STATION_NAME=\"%s\"&&MATRIX=%d",
-			(const char *)edit_swstation_box->currentText(),
-			matrix);
+  sql=QString("select NAME from OUTPUTS where ")+
+    "(STATION_NAME=\""+RDEscapeString(edit_swstation_box->currentText())+
+    "\")&&"+
+    QString().sprintf("(MATRIX=%d)&&",matrix)+
+    "(NAME!=\"\")";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     edit_swoutput_box->insertItem(q->value(0).toString());