demo cleanup customfilter, queryscope moved to model