Fix partition filters and add braces