diff --git a/src/views/AbstractView.ts b/src/views/AbstractView.ts
index d096486..e6a3aa3 100644
--- a/src/views/AbstractView.ts
+++ b/src/views/AbstractView.ts
@@ -87,11 +87,11 @@ abstract class AbstractView {
 
       // Vertically stack the cards of the current area.
       if (areaCards.length) {
+        // Create and insert a Header card.
         const areaHeaderCardOptions = (
           'headerCardConfiguration' in this.baseConfiguration ? this.baseConfiguration.headerCardConfiguration : {}
         ) as CustomHeaderCardConfig;
 
-        // Create and insert a Header card.
         areaCards.unshift(new HeaderCard(target, { title: area.name, ...areaHeaderCardOptions }).createCard());
 
         viewCards.push({ type: 'vertical-stack', cards: areaCards });
diff --git a/src/views/VacuumView.ts b/src/views/VacuumView.ts
index 8e4d3f7..050a58e 100644
--- a/src/views/VacuumView.ts
+++ b/src/views/VacuumView.ts
@@ -36,7 +36,7 @@ class VacuumView extends AbstractView {
     return {
       title: localize('vacuum.all_vacuums'),
       subtitle:
-        `${Registry.getCountTemplate(VacuumView.domain, 'ne', 'off')} ${localize('vacuum.vacuums')} ` +
+        `${Registry.getCountTemplate(VacuumView.domain, 'in', '[cleaning, returning]')} ${localize('vacuum.vacuums')} ` +
         localize('generic.busy'),
     };
   }