cherry picked ritika's fix for filter stickiness