Consistently use WorkState enum in state filter