Add back target filtering, but also include list targeting.