Changes to filtering and add message controls