Do not duplicate filters
Fixed warnings issues