diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc
index 680f9a8..e2477ec 100644
--- a/core/modules/search/search.pages.inc
+++ b/core/modules/search/search.pages.inc
@@ -88,9 +88,16 @@ function template_preprocess_search_results(&$variables) {
     $variables['module'] = check_plain($variables['module']);
   }
   foreach ($variables['results'] as $result) {
-    $variables['search_results'] .= theme('search_result', array('result' => $result, 'module' => $variables['module']));
+    $variables['search_results'][] = array(
+      '#theme' => 'search_result',
+      '#result' => $result,
+      '#module' => $variables['module'],
+    );
   }
-  $variables['pager'] = theme('pager', array('tags' => NULL));
+  $variables['pager'] = array(
+    '#theme' => 'pager',
+    '#tags' => NULL,
+  );
   $variables['theme_hook_suggestions'][] = 'search_results__' . $variables['module'];
 }
 
diff --git a/core/modules/search/templates/search-results.html.twig b/core/modules/search/templates/search-results.html.twig
index 12fd57e..1b1e370 100644
--- a/core/modules/search/templates/search-results.html.twig
+++ b/core/modules/search/templates/search-results.html.twig
@@ -21,13 +21,12 @@
  * @ingroup themeable
 #}
 {% if search_results %}
-  <h2>{{ 'Search results' | t }}</h2>
+  <h2>{{ 'Search results'|t }}</h2>
   <ol class="search-results {{ module }}-results">
     {{ search_results }}
   </ol>
   {{ pager }}
 {% else %}
-  <h2>{{ 'Your search yielded no results' | t }}</h2>
-  <!-- need to print search_help('search#noresults', drupal_help_arg()) as twig -->
+  <h2>{{ 'Your search yielded no results'|t }}</h2>
+  <!-- @todo Need to print search_help('search#noresults', drupal_help_arg()) as twig -->
 {% endif %}
-