Fixed FilterWidget and PropertyPart