State filter parameters moved to State*Context classes