Added support to VAR/RETURN in filter arguments

The use of variables (syntax VAR/RETURN) was not working if used in filter arguments of CALCULATE and CALCULATETABLE.