diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index a65ec9b667..c4455992cd 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -27,8 +27,9 @@
                 <span class="flex-right">{{loginCiphers.length}}</span>
             </div>
             <div class="box-content">
-                <app-cipher-row *ngFor="let c of loginCiphers" [cipher]="c" title="{{'autoFill' | i18n}}" [showView]="true"
-                    (onSelected)="fillCipher($event)" (onView)="viewCipher($event)">
+                <app-cipher-row *ngFor="let loginCipher of loginCiphers" [cipher]="loginCipher" 
+                    title="{{'autoFill' | i18n}}" [showView]="true" (onSelected)="fillCipher($event)" 
+                    (onView)="viewCipher($event)">
                 </app-cipher-row>
                 <div class="box-content-row padded no-hover" *ngIf="!loginCiphers.length">
                     <p class="text-center">{{'autoFillInfo' | i18n}}</p>
@@ -44,7 +45,7 @@
                 <span class="flex-right">{{cardCiphers.length}}</span>
             </div>
             <div class="box-content">
-                <app-cipher-row *ngFor="let c of cardCiphers" [cipher]="c" title="{{'autoFill' | i18n}}" [showView]="true"
+                <app-cipher-row *ngFor="let cardCipher of cardCiphers" [cipher]="cardCipher" title="{{'autoFill' | i18n}}" [showView]="true"
                     (onSelected)="fillCipher($event)" (onView)="viewCipher($event)"></app-cipher-row>
             </div>
         </div>
@@ -54,7 +55,7 @@
                 <span class="flex-right">{{identityCiphers.length}}</span>
             </div>
             <div class="box-content">
-                <app-cipher-row *ngFor="let c of identityCiphers" [cipher]="c" title="{{'autoFill' | i18n}}" [showView]="true"
+                <app-cipher-row *ngFor="let identityCipher of identityCiphers" [cipher]="identityCipher" title="{{'autoFill' | i18n}}" [showView]="true"
                     (onSelected)="fillCipher($event)" (onView)="viewCipher($event)"></app-cipher-row>
             </div>
         </div>
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index a679c82554..d80377bbe5 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -30,8 +30,9 @@
                     <span class="flex-right">{{favoriteCiphers.length}}</span>
                 </div>
                 <div class="box-content">
-                    <app-cipher-row *cdkVirtualFor="let c of favoriteCiphers" [cipher]="c" title="{{'viewItem' | i18n}}"
-                        (onSelected)="selectCipher($event)" (launchEvent)="launchCipher($event)"></app-cipher-row>
+                    <app-cipher-row *cdkVirtualFor="let favoriteCipher of favoriteCiphers" [cipher]="favoriteCipher"
+                        title="{{'viewItem' | i18n}}" (onSelected)="selectCipher($event)"
+                        (launchEvent)="launchCipher($event)"></app-cipher-row>
                 </div>
             </div>
             <div class="box list">
@@ -75,7 +76,7 @@
                     </a>
                 </div>
             </div>
-            <div class="box list" *ngIf="nestedFolders && nestedFolders.length">
+            <div class="box list" *ngIf="nestedFolders?.length">
                 <div class="box-header">
                     {{'folders' | i18n}}
                     <span class="flex-right">{{folderCount}}</span>
@@ -101,13 +102,13 @@
                     <span class="flex-right">{{nestedCollections.length}}</span>
                 </div>
                 <div class="box-content single-line">
-                    <a *ngFor="let c of nestedCollections" href="#" class="box-content-row" appStopClick appBlurClick
-                        (click)="selectCollection(c.node)">
+                    <a *ngFor="let nestedCollection of nestedCollections" href="#" class="box-content-row"
+                        appStopClick appBlurClick (click)="selectCollection(nestedCollection.node)">
                         <div class="row-main">
                             <div class="icon"><i class="fa fa-fw fa-lg fa-cube"></i></div>
-                            <span class="text">{{c.node.name}}</span>
+                            <span class="text">{{nestedCollection.node.name}}</span>
                         </div>
-                        <span class="row-sub-label">{{collectionCounts.get(c.node.id) || 0}}</span>
+                        <span class="row-sub-label">{{collectionCounts.get(nestedCollection.node.id) || 0}}</span>
                         <span><i class="fa fa-chevron-right fa-lg row-sub-icon"></i></span>
                     </a>
                 </div>
@@ -118,8 +119,9 @@
                     <div class="flex-right">{{noFolderCiphers.length}}</div>
                 </div>
                 <div class="box-content">
-                    <app-cipher-row *ngFor="let c of noFolderCiphers" [cipher]="c" title="{{'viewItem' | i18n}}"
-                        (onSelected)="selectCipher($event)" (launchEvent)="launchCipher($event)"></app-cipher-row>
+                    <app-cipher-row *ngFor="let noFolderCipher of noFolderCiphers" [cipher]="noFolderCipher"
+                        title="{{'viewItem' | i18n}}" (onSelected)="selectCipher($event)"
+                        (launchEvent)="launchCipher($event)"></app-cipher-row>
                 </div>
             </div>
             <div class="box list" *ngIf="deletedCount">
@@ -148,8 +150,9 @@
         <cdk-virtual-scroll-viewport itemSize="46" *ngIf="ciphers && ciphers.length > 0">
             <div class="box list full-list">
                 <div class="box-content">
-                    <app-cipher-row *cdkVirtualFor="let c of ciphers" [cipher]="c" title="{{'viewItem' | i18n}}" 
-                        (onSelected)="selectCipher($event)" (launchEvent)="launchCipher($event)"></app-cipher-row>
+                    <app-cipher-row *cdkVirtualFor="let searchedCipher of ciphers" [cipher]="searchedCipher"
+                        title="{{'viewItem' | i18n}}" (onSelected)="selectCipher($event)"
+                        (launchEvent)="launchCipher($event)"></app-cipher-row>
                 </div>
             </div>
         </cdk-virtual-scroll-viewport>