Retain state filter when changing order key