Added list filtering support