Reverted back to custom filter.