More cleanup on filtered list level 1