Updated filter() and filterAcc()