Namespace the custom filter correctly
Almost ready