Move the state filters into a single method