MLDS-312 MLDS-475 Fix filter toggling