diff --git a/frontend/controllers/download_accessions_controller.rb b/frontend/controllers/download_accessions_controller.rb
index ef67a49..3f19db1 100644
--- a/frontend/controllers/download_accessions_controller.rb
+++ b/frontend/controllers/download_accessions_controller.rb
@@ -3,7 +3,7 @@ class DownloadAccessionsController < ApplicationController
   set_access_control  "view_repository" => [:download]
 
   def download
-    download_params = params_for_backend_search.merge('aq' => params['aq'])
+    download_params = params_for_backend_search.merge('aq' => params['aq'], 'type[]' => 'accession')
 
     # things changed in v2.0.0
     build_filters(download_params) unless ASConstants.VERSION.start_with?('v1')
diff --git a/indexer/indexer.rb b/indexer/indexer.rb
index 4414254..dfb319c 100644
--- a/indexer/indexer.rb
+++ b/indexer/indexer.rb
@@ -5,9 +5,10 @@ class CommonIndexer
     indexer.add_document_prepare_hook {|doc, record|
       if doc['primary_type'] == 'accession'
         ASUtils.wrap(record['record']['linked_events']).each{|linked_event|
-          event = JSONModel::JSONModel(:event).find(JSONModel.parse_reference(linked_event['ref'])[:id])
+          event = JSONModel::JSONModel(:event).find(JSONModel.parse_reference(linked_event['ref'])[:id],
+                                                    :repo_id => record['record']['repository']['ref'].sub(/.*\//, ''))
           doc["event_#{event['event_type']}_u_sstr"] = event['outcome']
-          doc["event_#{event['event_type']}_begin_u_sstr"] = event['date']['begin']
+          doc["event_#{event['event_type']}_begin_u_sstr"] = event['date']['begin'] if event['date']
         }
       end
     }