♻️ Use new filter class instead of filtering inline