MDL-47059 Grades: Make natural weights work with exclude empty grades

Part of: MDL-46576