[Issue 9311] New: Singular overlays should be flagged as such