Fixed States filter (WHOO 200th commit!)