Attempt #2 at fixing FilterConfiguration per @rsmy's suggestions