Moved the FluentFilter logic into its own plugin