Reverted everything concerning the filtering for materials