updated filter mechanism to support individual data sets