Fixed the way filterVar, filterExpression, and filterValue are used