Added standalone state filter