Get filtering on agent state to work again