diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index ff8e4474..1ba308b6 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -298,8 +298,8 @@ QString CardInfo::getMainCardType() const
 QString CardInfo::getCorrectedName() const
 {
 	QString result = name;
-	// Fire // Ice, Circle of Protection: Red
-	return result.remove(" // ").remove(":");
+	// Fire // Ice, Circle of Protection: Red, "Ach! Hans, Run!", Who/What/When/Where/Why, Question Elemental?
+	return result.remove(" // ").remove(':').remove('"').remove('?').replace('/', ' ');
 }
 
 void CardInfo::addToSet(CardSet *set)
diff --git a/cockatrice/src/carddatabasemodel.h b/cockatrice/src/carddatabasemodel.h
index 45378257..d6404b42 100644
--- a/cockatrice/src/carddatabasemodel.h
+++ b/cockatrice/src/carddatabasemodel.h
@@ -31,11 +31,11 @@ private:
 	QSet<QString> cardTypes, cardColors;
 public:
 	CardDatabaseDisplayModel(QObject *parent = 0);
-	void setCardNameBeginning(const QString &_beginning) { cardNameBeginning = _beginning; invalidateFilter(); }
-	void setCardName(const QString &_cardName) { cardName = _cardName; invalidateFilter(); }
-	void setCardText(const QString &_cardText) { cardText = _cardText; invalidateFilter(); }
-	void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidateFilter(); }
-	void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidateFilter(); }
+	void setCardNameBeginning(const QString &_beginning) { cardNameBeginning = _beginning; invalidate(); }
+	void setCardName(const QString &_cardName) { cardName = _cardName; invalidate(); }
+	void setCardText(const QString &_cardText) { cardText = _cardText; invalidate(); }
+	void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidate(); }
+	void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidate(); }
 	void clearSearch();
 protected:
 	bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
diff --git a/cockatrice/src/window_deckeditor.cpp b/cockatrice/src/window_deckeditor.cpp
index ef16693d..e540aad6 100644
--- a/cockatrice/src/window_deckeditor.cpp
+++ b/cockatrice/src/window_deckeditor.cpp
@@ -68,6 +68,7 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
 	databaseView = new QTreeView();
 	databaseView->setModel(databaseDisplayModel);
 	databaseView->setUniformRowHeights(true);
+	databaseView->setRootIsDecorated(false);
 	databaseView->setAlternatingRowColors(true);
 	databaseView->setSortingEnabled(true);
 	databaseView->sortByColumn(0, Qt::AscendingOrder);