Fix total drop and row secondary suppression