Fix potential unwrap crash when quickly switching filters
Fix potential unwrap crash when quickly switching filters

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