Making the variable usage of FilterParameter is consistent