fixed: some filter issues