Fix some bugs when switching filters with deck selected
Fix some bugs when switching filters with deck selected

mattwelborn/HSTracker,jonnguy/HSTracker,ifeherva/HSTracker,jonnguy/HSTracker,mattwelborn/HSTracker,mattwelborn/HSTracker,mattwelborn/HSTracker,ifeherva/HSTracker,jonnguy/HSTracker,bmichotte/HSTracker,bmichotte/HSTracker