diff --git a/src/database/SearchFilter.cpp b/src/database/SearchFilter.cpp
index e86c0041..44c227cb 100644
--- a/src/database/SearchFilter.cpp
+++ b/src/database/SearchFilter.cpp
@@ -46,8 +46,6 @@ SqlQuery generatePartialQuery(SearchFilter& filter)
 
 		for (auto nameLikeMatch : nameLikeMatches)
 		{
-
-			// Artist
 			switch (nameLikeMatch.first)
 			{
 				case SearchFilter::Field::Artist:
@@ -75,7 +73,8 @@ SqlQuery generatePartialQuery(SearchFilter& filter)
 	}
 
 	// Process id exact match parameters
-
+	// Id list may be long, we do not bind the parameters
+	// Safe since we already known these are just ints
 	for (auto idMatch : filter.idMatch)
 	{
 		WhereClause idWhereClause;
diff --git a/src/ui/audio/desktop/TableFilter.cpp b/src/ui/audio/desktop/TableFilter.cpp
index 34a0c686..f7197779 100644
--- a/src/ui/audio/desktop/TableFilter.cpp
+++ b/src/ui/audio/desktop/TableFilter.cpp
@@ -85,6 +85,8 @@ TableFilterGenre::layoutSizeChanged (int width, int height)
 void
 TableFilterGenre::refresh(SearchFilter& filter)
 {
+	this->clearSelection();
+
 	Genre::updateUIQueryModel(DboSession(), _queryModel, filter);
 }
 
@@ -162,6 +164,7 @@ TableFilterArtist::layoutSizeChanged (int width, int height)
 void
 TableFilterArtist::refresh(SearchFilter& filter)
 {
+	this->clearSelection();
 	Artist::updateUIQueryModel(DboSession(), _queryModel, filter);
 }
 
@@ -245,6 +248,7 @@ TableFilterRelease::layoutSizeChanged (int width, int height)
 void
 TableFilterRelease::refresh(SearchFilter& filter)
 {
+	this->clearSelection();
 	Release::updateUIQueryModel(DboSession(), _queryModel, filter);
 }
 
diff --git a/src/ui/audio/desktop/TrackView.cpp b/src/ui/audio/desktop/TrackView.cpp
index a7115557..ebf2a432 100644
--- a/src/ui/audio/desktop/TrackView.cpp
+++ b/src/ui/audio/desktop/TrackView.cpp
@@ -167,6 +167,7 @@ TrackView::emitStats(const SearchFilter& filter)
 void
 TrackView::refresh(SearchFilter& filter)
 {
+	this->clearSelection();
 	Track::updateUIQueryModel(DboSession(), _queryModel, filter);
 
 	emitStats(filter);