diff --git a/contrib/search_api_stats_block/search_api_stats_block.module b/contrib/search_api_stats_block/search_api_stats_block.module
index e838859..9bf3cc4 100644
--- a/contrib/search_api_stats_block/search_api_stats_block.module
+++ b/contrib/search_api_stats_block/search_api_stats_block.module
@@ -30,7 +30,7 @@ function search_api_stats_block_block_view($delta = '') {
   if (!empty($s_name) && !empty($i_name)) {
     $block = array(
       'subject' => t('Top search phrases'),
-      'content' => _search_api_stats_block_show_keywords($s_name, $i_name),
+      'content' => array('#markup' => _search_api_stats_block_show_keywords($s_name, $i_name)),
     );
   }
 
@@ -55,7 +55,14 @@ function search_api_stats_block_block_configure($delta = '') {
       '#default_value' => empty($config[$s_name][$i_name]['num_phrases']) ? 8 : $config[$s_name][$i_name]['num_phrases'],
       '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 30)),
     );
-
+    
+    // Parameter name for multiple language
+    $form['search_api_stats_block_param_lang'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Multiple Language Support?'),
+      '#default_value' => empty($config[$s_name][$i_name]['param_lang']) ? FALSE : $config[$s_name][$i_name]['param_lang'],
+    );
+    
     // Path of search page
     $form['search_api_stats_block_path'] = array(
       '#type' => 'textfield',
@@ -87,7 +94,9 @@ function search_api_stats_block_block_save($delta = '', $edit = array()) {
 
     // Number of top search phrases to display
     $config[$s_name][$i_name]['num_phrases'] = (int)$edit['search_api_stats_block_num_phrases'];
-
+    // Path of search page
+    $config[$s_name][$i_name]['param_lang'] = $edit['search_api_stats_block_param_lang'];
+    
     // Path of search page
     $config[$s_name][$i_name]['path'] = $edit['search_api_stats_block_path'];
 
@@ -117,15 +126,18 @@ function search_api_stats_block_theme($existing, $type, $theme, $path) {
  * @return markup         Complete markup for the block content
  */
 function _search_api_stats_block_show_keywords($s_name, $i_name) {
+  global $language;
   $config = variable_get('search_api_stats_block_config', array());
 
   // Default variables passed to theming function.
   $phrases = array();
   $path = empty($config[$s_name][$i_name]['path']) ? '' : $config[$s_name][$i_name]['path'];
   $param_name = empty($config[$s_name][$i_name]['param_name']) ? 'keywords' : $config[$s_name][$i_name]['param_name'];
-
-  $result = db_query_range("SELECT *, count(*) as num FROM {search_api_stats} WHERE s_name=:s_name AND i_name=:i_name GROUP BY keywords ORDER BY num DESC", 0, 8, array(':s_name' => $s_name, ':i_name' => $i_name));
-
+  if ($config[$s_name][$i_name]['param_lang']) {
+    $result = db_query_range("SELECT *, count(*) as num FROM {search_api_stats} WHERE s_name=:s_name AND i_name=:i_name AND language=:lang GROUP BY keywords ORDER BY num DESC", 0, 8, array(':s_name' => $s_name, ':i_name' => $i_name,':lang' => $language->language));
+  } else {
+    $result = db_query_range("SELECT *, count(*) as num FROM {search_api_stats} WHERE s_name=:s_name AND i_name=:i_name GROUP BY keywords ORDER BY num DESC", 0, 8, array(':s_name' => $s_name, ':i_name' => $i_name));
+  }
   foreach ($result as $phrase) {
     $phrases[$phrase->keywords] = (array)$result;
   }