Various fixes to filter material