Fix bug #1394240 and add new column 'All'