diff --git a/components/css/ng2-select.css b/components/css/ng2-select.css
index c0aac6a3..4a133f49 100644
--- a/components/css/ng2-select.css
+++ b/components/css/ng2-select.css
@@ -42,6 +42,10 @@
     display:none;
 }
 
+.ui-select-match-close {
+	margin-top:2px;
+}
+
 body > .select2-container.open {
   z-index: 9999; /* The z-index Select2 applies to the select2-drop */
 }
diff --git a/components/select/select-item.ts b/components/select/select-item.ts
index eff1efb9..135ebc4e 100644
--- a/components/select/select-item.ts
+++ b/components/select/select-item.ts
@@ -45,3 +45,4 @@ export class SelectItem {
     return r;
   }
 }
+
diff --git a/components/select/select.ts b/components/select/select.ts
index 78a5c5b9..422f48e8 100644
--- a/components/select/select.ts
+++ b/components/select/select.ts
@@ -20,9 +20,9 @@ import {IOptionsBehavior} from './select-interfaces';
 import {escapeRegexp} from './common';
 
 let optionsTemplate = `
-    <ul *ngIf="optionsOpened && options && options.length > 0 && !itemObjects[0].hasChildren()"
+    <ul *ngIf="optionsOpened && !itemObjects[0].hasChildren()"
         class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu">
-      <li class="ui-select-choices-group">
+      <li class="ui-select-choices-group" *ngIf="options && options.length > 0">
         <div *ngFor="#o of options"
              class="ui-select-choices-row"
              [class.active]="isActive(o)"
@@ -33,11 +33,12 @@ let optionsTemplate = `
           </a>
         </div>
       </li>
+      <li *ngIf="!options || options.length === 0" class="disabled" (click)="noMatchClick($event)"><a href="javascript:void(0)">No matches found</a></li>
     </ul>
 
-    <ul *ngIf="optionsOpened && options && options.length > 0 && itemObjects[0].hasChildren()"
+    <ul *ngIf="optionsOpened && itemObjects[0].hasChildren()"
         class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu">
-      <li *ngFor="#c of options; #index=index" class="ui-select-choices-group">
+      <li *ngFor="#c of options; #index=index" class="ui-select-choices-group" *ngIf="options && options.length > 0">
         <div class="divider" *ngIf="index > 0"></div>
         <div class="ui-select-choices-group-label dropdown-header">{{c.text}}</div>
 
@@ -52,11 +53,12 @@ let optionsTemplate = `
           </a>
         </div>
       </li>
+      <li *ngIf="!options || options.length === 0" class="disabled" (click)="noMatchClick($event)"><a href="javascript:void(0)">No matches found</a></li>
     </ul>
 `;
 
 @Component({
-  selector: 'ng-select',
+  selector: 'ng2-select',
   pipes: [HighlightPipe],
   template: `
   <div tabindex="0"
@@ -182,6 +184,14 @@ export class Select {
     }, 0);
   }
 
+  private noMatchClick(e: any) {
+    if (e) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.focusToInput(this.inputValue);
+    }
+  }
+  
   private matchClick(e:any) {
     if (this._disabled === true) {
       return;
@@ -228,9 +238,10 @@ export class Select {
   }
 
   private open() {
-    this.options = this.itemObjects
-      .filter(option => (this.multiple === false ||
-      this.multiple === true && !this.active.find(o => option.text === o.text)));
+    if (this.optionsOpened)
+          return;
+          
+    this.populateOptions();
 
     if (this.options.length > 0) {
       this.behavior.first();
@@ -238,6 +249,12 @@ export class Select {
 
     this.optionsOpened = true;
   }
+  
+  private populateOptions() {
+    this.options = this.itemObjects
+      .filter(option => (this.multiple === false ||
+      this.multiple === true && !this.active.find(o => option.text === o.text)));
+  }
 
   ngOnInit() {
     this.behavior = this.itemObjects[0].hasChildren() ?
@@ -263,7 +280,7 @@ export class Select {
         return;
       }
 
-      if (e.srcElement.contains(context.element.nativeElement)
+      if (context.element.nativeElement.contains(e.srcElement)
       && e.srcElement && e.srcElement.className &&
         e.srcElement.className.indexOf('ui-select') >= 0) {
         if (e.target.nodeName !== 'INPUT') {
@@ -395,7 +412,8 @@ export class Select {
   }
 
   private selectActiveMatch() {
-    this.selectMatch(this.activeOption);
+    if (this.options && this.options.length > 0)
+      this.selectMatch(this.activeOption);
   }
 
   private selectMatch(value:SelectItem, e:Event = null) {
@@ -405,7 +423,7 @@ export class Select {
     }
 
     if (this.options.length <= 0) {
-      return;
+      this.populateOptions(); //load options, if they aren't yet populated
     }
 
     if (this.multiple === true) {
@@ -420,9 +438,11 @@ export class Select {
 
     this.doEvent('selected', value);
     this.hideOptions();
+    this.inputValue = ''; //clear highlight pipe match
 
     if (this.multiple === true) {
       this.focusToInput('');
+      this.open(); 
     } else {
       this.focusToInput( stripTags(value.text) );
       this.element.nativeElement.querySelector('.ui-select-container').focus();
@@ -629,3 +649,4 @@ export class ChildrenBehavior extends Behavior implements IOptionsBehavior {
 }
 
 
+