Improved the way an empty set of metrics are handled in plugins