diff --git a/src/main/webapp/app/teaserContent/teaserContent.component.html b/src/main/webapp/app/teaserContent/teaserContent.component.html
index 898cf752dc2d899c9ad82ee8fd06746654289b5d..8c014ad99ed652bcc076cc6fa1fa6b5bf2e3ff59 100644
--- a/src/main/webapp/app/teaserContent/teaserContent.component.html
+++ b/src/main/webapp/app/teaserContent/teaserContent.component.html
@@ -3,19 +3,19 @@
 	<div class="col-sm-3">
 	  <p style="padding-left: 30px;"><strong>Keywords</strong></p>
 	  <ul style="list-style-type: circle;">
-                <li *ngFor="let keyWord of keywords"><a href="#">{{keyWord}}</a></li>
+                <li *ngFor="let keyWord of keywords"><a (click)="clickKeyword(keyWord)">{{keyWord}}</a></li>
       </ul>
     </div>
 	<div class="col-sm-3">
 	  <p style="padding-left: 30px;"><strong>Programming Languages</strong></p>
 	  <ul style="list-style-type: circle;">
-                <li *ngFor="let programmingLanguage of programmingLanguages"><a href="#">{{programmingLanguage}}</a></li>
+                <li *ngFor="let programmingLanguage of programmingLanguages"><a (click)="clickLanguage(programmingLanguage)">{{programmingLanguage}}</a></li>
       </ul>
     </div>
 	<div class="col-sm-3">
 	  <p style="padding-left: 30px;"><strong>Contributors</strong></p>
 	  <ul style="list-style-type: circle;">
-                <li *ngFor="let contributor of contributors"><a href="#">{{contributor}}</a></li>
+                <li *ngFor="let contributor of contributors"><a (click)="clickContributor(contributor)">{{contributor}}</a></li>
       </ul>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/main/webapp/app/teaserContent/teaserContent.component.ts b/src/main/webapp/app/teaserContent/teaserContent.component.ts
index d122693d8db0525d19c782b97ea9cc9102ff6e97..5740293cdd97c9a336f7d067d6af5b75a7eeef8a 100644
--- a/src/main/webapp/app/teaserContent/teaserContent.component.ts
+++ b/src/main/webapp/app/teaserContent/teaserContent.component.ts
@@ -1,18 +1,26 @@
 import { Component, OnInit } from '@angular/core';
 
 import { SearchService } from 'app/search/service/search-service';
+import {SearchInputComponent} from 'app/search-input/search-input.component'
+
+import { Router } from '@angular/router';
+
 
 @Component({
   selector: 'jhi-teaser-content',
   templateUrl: './teaserContent.component.html',
   styleUrls: ['./teaserContent.component.scss'],
+  providers: [SearchInputComponent]
 })
 export class TeaserContentComponent implements OnInit {
   public keywords: Array<String> = new Array<String>();
   public contributors: Array<String> = new Array<String>();
   public programmingLanguages: Array<String> = new Array<String>();
 
-  constructor(private searchService: SearchService) {}
+  constructor(
+	private searchService: SearchService,
+	private router: Router,
+	private searchInputComponent: SearchInputComponent) {}
 
   ngOnInit(): void {
     this.searchService.getKeywordsAutoComplete('').subscribe(
@@ -41,4 +49,16 @@ export class TeaserContentComponent implements OnInit {
       }
     );
   }
+
+	clickLanguage(programmingLanguage: String): void {
+		 this.router.navigate(['/search'], { queryParams: { pl: programmingLanguage } });
+	}
+	
+	clickContributor(contributor: String): void {
+		 this.router.navigate(['/search'], { queryParams: { a: contributor } });
+	}
+
+	clickKeyword(keyWord: String): void {
+		 this.router.navigate(['/search'], { queryParams: { kw: keyWord } });
+	}
 }