Changed 'filter-data' to accept function/array/object variables in addition to deffered