Add sort by message and source.