diff --git a/.travis.yml b/.travis.yml
index 4130ee699f..ac0efd49a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ php:
 
 install:
   - composer selfupdate
-  - composer --version
-  - composer install --no-dev
   - composer update
   - php artisan env
   - mv -v .env.testing .env
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index e9793687f3..2e75c9b45e 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -28,26 +28,26 @@ class SearchController extends Controller
     public function index(SearchInterface $searcher)
     {
 
-        $subTitle = null;
-        $rawQuery = null;
-        $result   = [];
+        $subTitle      = null;
+        $query         = null;
+        $result        = [];
+        $title         = trans('firefly.search');
+        $mainTitleIcon = 'fa-search';
         if (!is_null(Input::get('q')) && strlen(Input::get('q')) > 0) {
-            $rawQuery = trim(Input::get('q'));
-            $words    = explode(' ', $rawQuery);
-            $subTitle = trans('firefly.search_results_for', ['query' => $rawQuery]);
+            $query    = trim(Input::get('q'));
+            $words    = explode(' ', $query);
+            $subTitle = trans('firefly.search_results_for', ['query' => $query]);
 
-            $transactions = $searcher->searchTransactions($words);
-            $accounts     = $searcher->searchAccounts($words);
-            $categories   = $searcher->searchCategories($words);
-            $budgets      = $searcher->searchBudgets($words);
-            $tags         = $searcher->searchTags($words);
+            $transactions = [];//$searcher->searchTransactions($words);
+            $accounts     = [];//$searcher->searchAccounts($words);
+            $categories   = [];//$searcher->searchCategories($words);
+            $budgets      = [];//$searcher->searchBudgets($words);
+            $tags         = [];//$searcher->searchTags($words);
             $result       = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags];
 
         }
 
-        return view('search.index')->with('title', 'Search')->with('subTitle', $subTitle)->with(
-            'mainTitleIcon', 'fa-search'
-        )->with('query', $rawQuery)->with('result', $result);
+        return view('search.index', compact('title', 'subTitle', 'mainTitleIcon', 'query', 'result'));
     }
 
 }
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 36aa71df2d..72f8eb612e 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -21,6 +21,7 @@ return [
     'showEverything'                    => 'Show everything',
     'never'                             => 'Never',
     'search_results_for'                => 'Search results for ":query"',
+    'search'                            => 'Search',
     'bounced_error'                     => 'The message sent to :email bounced, so no access for you.',
     'deleted_error'                     => 'These credentials do not match our records.',
     'general_blocked_error'             => 'Your account has been disabled, so you cannot login.',