Add back close filter functionality from commit fa1a2cc7a8  after been delete on the conflict resolve in commit b6fa2524ae.