Filter now saves previous state correctly.