Updated filtering and docs