Update Filter

Better Filter, no second call of Filter Possible