#1 Fix FilterHelper