diff --git a/UI/WebServerResources/js/Common/sgSearch.directive.js b/UI/WebServerResources/js/Common/sgSearch.directive.js
index 20989d188..1f4185476 100644
--- a/UI/WebServerResources/js/Common/sgSearch.directive.js
+++ b/UI/WebServerResources/js/Common/sgSearch.directive.js
@@ -67,7 +67,7 @@
   function sgSearchController($scope, $element) {
     // Controller variables
     this.previous = { searchText: '', searchField: '' };
-    this.searchText = '';
+    this.searchText = null;
     this.searchField = $element.find('md-option').attr('value'); // defaults to first option
 
     // Model options
@@ -81,7 +81,7 @@
 
     // Method to call on data changes
     this.onChange = function(value) {
-      if (typeof this.searchText != 'undefined') {
+      if (this.searchText != null) {
         if (this.searchText != this.previous.searchText || this.searchField != this.previous.searchField) {
           if (this.searchText.length > 2 || this.searchText.length == 0) {
             // See https://github.com/angular/angular.js/issues/7635
diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js
index 5b4648fe4..52a818454 100644
--- a/UI/WebServerResources/js/Contacts/Card.service.js
+++ b/UI/WebServerResources/js/Contacts/Card.service.js
@@ -118,7 +118,7 @@
     if (!this.$$fullname)
       this.$$fullname = this.$fullname();
     if (!this.$$email)
-      this.$$email = this.$preferredEmail();
+      this.$$email = this.$preferredEmail(partial);
     if (!this.$$image)
       this.$$image = this.image || Card.$gravatar(this.$preferredEmail(partial), 32);
     this.selected = false;
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index 5ec3fd45c..caf1cf4b1 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -178,7 +178,7 @@
   Mailbox.prototype.$filter = function(sort, filters) {
     var futureMailboxData, options;
 
-    if (!angular.isDefined(sort)) {
+    if (angular.isUndefined(sort)) {
       sort = { sortingAttributes: { match: 'OR', sort: 'date', asc: false } };
     }
     options = { sortingAttributes: sort };
@@ -366,7 +366,6 @@
    * @return a promise of the HTTP operation
    */
   Mailbox.prototype.$deleteMessages = function(uids) {
-    var _this = this;
     return Mailbox.$$resource.post(this.id, 'batchDelete', {uids: uids});
   };
 
@@ -377,7 +376,6 @@
    * @return a promise of the HTTP operation
    */
   Mailbox.prototype.$copyMessages = function(uids, folder) {
-    var _this = this;
     return Mailbox.$$resource.post(this.id, 'copyMessages', {uids: uids, folder: folder});
   };
 
@@ -388,7 +386,6 @@
    * @return a promise of the HTTP operation
    */
   Mailbox.prototype.$moveMessages = function(uids, folder) {
-    var _this = this;
     return Mailbox.$$resource.post(this.id, 'moveMessages', {uids: uids, folder: folder});
   };
   
diff --git a/UI/WebServerResources/js/Scheduler/CalendarsController.js b/UI/WebServerResources/js/Scheduler/CalendarsController.js
index 309256409..f1a0da2e5 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarsController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarsController.js
@@ -159,6 +159,7 @@
           folder: calendar
         }
       });
+
       /**
        * @ngInject
        */