Replace filter with empty array; add TODO