Proper fix for using parameters in filter expressions - need to evaluate the resulting expression again in case it has other variables