Complete version with filters