diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 3e893d57b59a..e5b74453e4e0 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -31,6 +31,11 @@ class ImportController extends BaseController
             }
         }
 
+        if ( ! count($files)) {
+            Session::flash('error', trans('texts.select_file'));
+            return Redirect::to('/settings/' . ACCOUNT_IMPORT_EXPORT);
+        }
+
         try {
             if ($source === IMPORT_CSV) {
                 $data = $this->importService->mapCSV($files);
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 57a26166a127..1bc8160dff7c 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -23,6 +23,7 @@ class QueryLogging
         // Enable query logging for development
         if (Utils::isNinjaDev()) {
             DB::enableQueryLog();
+            $timeStart = microtime(true);
         }
 
         $response = $next($request);
@@ -32,7 +33,9 @@ class QueryLogging
             if (strstr($request->url(), '_debugbar') === false) {
                 $queries = DB::getQueryLog();
                 $count = count($queries);
-                Log::info($request->method() . ' - ' . $request->url() . ": $count queries");
+                $timeEnd = microtime(true);
+                $time = $timeEnd - $timeStart;
+                Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
                 //Log::info($queries);
             }
         }
diff --git a/resources/views/accounts/import_export.blade.php b/resources/views/accounts/import_export.blade.php
index 1d53c9744c8a..84e4a99075fa 100644
--- a/resources/views/accounts/import_export.blade.php
+++ b/resources/views/accounts/import_export.blade.php
@@ -92,6 +92,7 @@
 
 <script type="text/javascript">
   $(function() {
+      setFileTypesVisible();
       setCheckboxesEnabled();
   });