More careful structure filtration.