Fix expiration filter to accept a block, fixes #145, closes #146