Fixing filter types to new style.