Updated filtering and added summary