Clean the import paramenters, even on crash
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into layout-2.0
Adhere to new central interface, and show total hit count on search page