diff --git a/app/src/components/transactions/transactions.ts b/app/src/components/transactions/transactions.ts
index f2bb011..111310b 100644
--- a/app/src/components/transactions/transactions.ts
+++ b/app/src/components/transactions/transactions.ts
@@ -16,8 +16,8 @@ import { Http } from '@angular/http';
 export class TransactionsComponent {
 
   public loading: boolean = true;
-  @Input() public blockHash: string;
-  @Input() public address: string;
+  @Input() public queryType: string;
+  @Input() public queryValue: string;
   public transactions: any = [];
 
   constructor(private navCtrl: NavController, private http: Http) {
@@ -25,21 +25,10 @@ export class TransactionsComponent {
 
   private ngOnInit(): void {
     let apiPrefix: string = 'http://localhost:3001/insight-api/';
-    let lookupType: string, lookupValue: string;
 
-    if (this.blockHash) {
-      lookupType = 'blocks';
-      lookupValue = this.blockHash;
-    }
-    if (this.address) {
-      lookupType = 'address';
-      lookupValue = this.address;
-    }
+    let url: string = apiPrefix + 'txs?' + this.queryType + '=' + this.queryValue;
 
-    console.log('blockHash', this.blockHash);
-    console.log('address', this.address);
-
-    this.http.get(apiPrefix + 'txs?' + lookupType + '=' + lookupValue).subscribe(
+    this.http.get(url).subscribe(
       (data) => {
         this.transactions = JSON.parse(data['_body']);
         this.loading = false;
diff --git a/app/src/pages/address/address.html b/app/src/pages/address/address.html
index 11ab88f..08555a7 100644
--- a/app/src/pages/address/address.html
+++ b/app/src/pages/address/address.html
@@ -49,5 +49,5 @@
     </ion-row>
   </ion-grid>
 
-    <transactions [address]="address"></transactions>
+    <transactions [queryType]="'address'" [queryValue]="address"></transactions>
 </ion-content>
diff --git a/app/src/pages/address/address.module.ts b/app/src/pages/address/address.module.ts
index c02f6cf..9a6151e 100644
--- a/app/src/pages/address/address.module.ts
+++ b/app/src/pages/address/address.module.ts
@@ -1,15 +1,15 @@
 import { NgModule } from '@angular/core';
 import { IonicPageModule } from 'ionic-angular';
 import { AddressPage } from './address';
-import { TransactionsComponent } from '../../components/transactions/transactions';
+import { TransactionsComponentModule } from '../../components/transactions/transactions.module';
 
 @NgModule({
   declarations: [
-    AddressPage,
-    TransactionsComponent
+    AddressPage
   ],
   imports: [
-    IonicPageModule.forChild(AddressPage)
+    IonicPageModule.forChild(AddressPage),
+    TransactionsComponentModule
   ],
   exports: [
     AddressPage
diff --git a/app/src/pages/block-detail/block-detail.html b/app/src/pages/block-detail/block-detail.html
index 428a119..83ff588 100644
--- a/app/src/pages/block-detail/block-detail.html
+++ b/app/src/pages/block-detail/block-detail.html
@@ -33,7 +33,7 @@
     <p>Next Block <a (click)="goToNextBlock()">{{ block.height + 1 }}</a></p>
 
     <h3>Transactions</h3>
-    <transactions [blockHash]="block.hash"></transactions>
+    <transactions [queryType]="'block'" [queryValue]="block.hash"></transactions>
   </div>
   <div *ngIf="loading">
     <p>Loading...</p>
diff --git a/app/src/pages/block-detail/block-detail.module.ts b/app/src/pages/block-detail/block-detail.module.ts
index 1a14b2f..8a301c0 100644
--- a/app/src/pages/block-detail/block-detail.module.ts
+++ b/app/src/pages/block-detail/block-detail.module.ts
@@ -1,15 +1,15 @@
 import { NgModule } from '@angular/core';
 import { IonicPageModule } from 'ionic-angular';
 import { BlockDetailPage } from './block-detail';
-import { TransactionsComponent } from '../../components/transactions/transactions';
+import { TransactionsComponentModule } from '../../components/transactions/transactions.module';
 
 @NgModule({
   declarations: [
-    BlockDetailPage,
-    TransactionsComponent
+    BlockDetailPage
   ],
   imports: [
-    IonicPageModule.forChild(BlockDetailPage)
+    IonicPageModule.forChild(BlockDetailPage),
+    TransactionsComponentModule
   ],
   exports: [
     BlockDetailPage