Finally fixed exclude functionality