Changes Search Filter to be Results Editor and adds the ability to edit the was a sumamry appears in search results, also fixes a bug with stemmer and require_once, a=chris

diff --git a/configs/createdb.php b/configs/createdb.php
index f1692fa07..0b8459e5c 100755
--- a/configs/createdb.php
+++ b/configs/createdb.php
@@ -75,7 +75,7 @@ if(!in_array(DBMS, array('sqlite', 'sqlite3'))) {
 $db->selectDB(DB_NAME);

 $db->execute("CREATE TABLE VERSION (ID INTEGER PRIMARY KEY)");
-$db->execute("INSERT INTO VERSION VALUES (6)");
+$db->execute("INSERT INTO VERSION VALUES (7)");

 $db->execute("CREATE TABLE USER (USER_ID INTEGER PRIMARY KEY $auto_increment, ".
     "USER_NAME VARCHAR(16) UNIQUE,  PASSWORD VARCHAR(16))");
@@ -144,7 +144,7 @@ $db->execute("INSERT INTO ACTIVITY VALUES (3, 3, 'manageRoles')");
 $db->execute("INSERT INTO ACTIVITY VALUES (4, 4, 'manageCrawls')");
 $db->execute("INSERT INTO ACTIVITY VALUES (5, 5, 'mixCrawls')");
 $db->execute("INSERT INTO ACTIVITY VALUES (6, 6, 'pageOptions')");
-$db->execute("INSERT INTO ACTIVITY VALUES (7, 7, 'searchFilters')");
+$db->execute("INSERT INTO ACTIVITY VALUES (7, 7, 'resultsEditor')");
 $db->execute("INSERT INTO ACTIVITY VALUES (8, 8, 'manageMachines')");
 $db->execute("INSERT INTO ACTIVITY VALUES (9, 9, 'manageLocales')");
 $db->execute("INSERT INTO ACTIVITY VALUES (10, 10, 'configure')");
@@ -155,7 +155,7 @@ $db->execute("INSERT INTO TRANSLATION VALUES (3, 'db_activity_manage_roles')");
 $db->execute("INSERT INTO TRANSLATION VALUES (4, 'db_activity_manage_crawl')");
 $db->execute("INSERT INTO TRANSLATION VALUES (5, 'db_activity_mix_crawls')");
 $db->execute("INSERT INTO TRANSLATION VALUES (6, 'db_activity_file_options')");
-$db->execute("INSERT INTO TRANSLATION VALUES (7,'db_activity_search_filters')");
+$db->execute("INSERT INTO TRANSLATION VALUES (7,'db_activity_results_editor')");
 $db->execute("INSERT INTO TRANSLATION VALUES(8,'db_activity_manage_machines')");
 $db->execute("INSERT INTO TRANSLATION VALUES (9,'db_activity_manage_locales')");
 $db->execute("INSERT INTO TRANSLATION VALUES (10, 'db_activity_configure')");
@@ -167,7 +167,7 @@ $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (3, 1, 'Manage Roles')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (4, 1, 'Manage Crawls')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (5, 1, 'Mix Crawls')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (6, 1, 'Page Options')");
-$db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (7, 1, 'Search Filters')");
+$db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (7, 1, 'Results Editor')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (8, 1, 'Manage Machines')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (9, 1, 'Manage Locales')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (10, 1, 'Configure')");
@@ -185,7 +185,7 @@ $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (5, 5,
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (6, 5,
     'Options de fichier')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (7, 5,
-    'Les filtres de recherche')");
+    'Éditeur de résultats')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (8, 5,
     'Modifier les ordinateurs')");
 $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (9, 5,
diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php
index 8f4b3e752..27ffef0c2 100755
--- a/controllers/admin_controller.php
+++ b/controllers/admin_controller.php
@@ -73,7 +73,7 @@ class AdminController extends Controller implements CrawlConstants
      * @var array
      */
     var $activities = array("signin", "manageAccount", "manageUsers",
-        "manageRoles", "manageCrawls", "pageOptions", "searchFilters",
+        "manageRoles", "manageCrawls", "pageOptions", "resultsEditor",
         "manageMachines", "manageLocales", "crawlStatus", "mixCrawls",
         "machineStatus", "configure");

@@ -1426,9 +1426,9 @@ class AdminController extends Controller implements CrawlConstants
      * @return array $data info about the groups and their contents for a
      *      particular crawl mix
      */
-    function searchFilters()
+    function resultsEditor()
     {
-        $data["ELEMENT"] = "searchfiltersElement";
+        $data["ELEMENT"] = "resultseditorElement";
         $data['SCRIPT'] = "";

         if(isset($_REQUEST['disallowed_sites'])) {
@@ -1444,12 +1444,58 @@ class AdminController extends Controller implements CrawlConstants
             $data['disallowed_sites'] = implode("\n", $disallowed_sites);
             $this->searchfiltersModel->set($disallowed_sites);
             $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
-                tl('admin_controller_site_filter_update')."</h1>')";
+                tl('admin_controller_results_editor_update')."</h1>')";
         }
         if(!isset($data['disallowed_sites'])) {
             $data['disallowed_sites'] =
                 implode("\n", $this->searchfiltersModel->getUrls());
         }
+        foreach (array("URL", "TITLE", "DESCRIPTION") as $field) {
+            $data[$field] = (isset($_REQUEST[$field])) ?
+                $this->clean($_REQUEST[$field], "string") :
+                 ((isset($data[$field]) ) ? $data[$field] : "");
+        }
+        if($data["URL"] != "") {
+            $data["URL"] = UrlParser::canonicalLink($data["URL"],"");
+        }
+        $tmp = tl('admin_controller_edited_pages');
+        $data["URL_LIST"] = array ($tmp => $tmp);
+        $summaries = $this->searchfiltersModel->getEditedPageSummaries();
+        foreach($summaries as $hash => $summary) {
+            $data["URL_LIST"][$summary[self::URL]] = $summary[self::URL];
+        }
+        if(isset($_REQUEST['arg']) ) {
+            switch($_REQUEST['arg'])
+            {
+                case "save_page":
+                    $missing_page_field = ($data["URL"] == "") ? true: false;
+                    if($missing_page_field) {
+                        $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
+                            tl('admin_controller_results_editor_need_url').
+                            "</h1>')";
+                    } else {
+                        $this->searchfiltersModel->updateResultPage(
+                            $data["URL"], $data["TITLE"], $data["DESCRIPTION"]);
+                        $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
+                            tl('admin_controller_results_editor_page_updated').
+                            "</h1>')";
+                    }
+                break;
+                case "load_url":
+                    $hash_url = crawlHash($_REQUEST['LOAD_URL'], true);
+                    if(isset($summaries[$hash_url])) {
+                        $data["URL"] = $this->clean($_REQUEST['LOAD_URL'],
+                            "string");
+                        $data["TITLE"] = $summaries[$hash_url][self::TITLE];
+                        $data["DESCRIPTION"] = $summaries[$hash_url][
+                            self::DESCRIPTION];
+                        $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
+                            tl('admin_controller_results_editor_page_loaded').
+                            "</h1>')";
+                    }
+                break;
+            }
+        }

         return $data;
     }
diff --git a/controllers/search_controller.php b/controllers/search_controller.php
index 6305fd6a3..63a934ba8 100755
--- a/controllers/search_controller.php
+++ b/controllers/search_controller.php
@@ -432,8 +432,11 @@ class SearchController extends Controller implements CrawlConstants
                 $top_phrases  =
                     $this->getTopPhrases($crawl_item, 3, $index_name);
                 $top_query = implode(" ", $top_phrases);
+                $filter = $this->searchfiltersModel->getFilter();
+                $this->phraseModel->editedPageSummaries =
+                    $this->searchfiltersModel->getEditedPageSummaries();
                 $phrase_results = $this->phraseModel->getPhrasePageResults(
-                    $top_query, $limit, $results_per_page, false, NULL,
+                    $top_query, $limit, $results_per_page, false, $filter,
                     $use_cache_if_possible, $raw, $queue_servers);
                 $data['PAGING_QUERY'] = "index.php?c=search&a=related&arg=".
                     urlencode($url);
@@ -470,6 +473,8 @@ class SearchController extends Controller implements CrawlConstants
                             $this->phraseModel->rewriteMixQuery($query, $mix);
                     }
                     $filter = $this->searchfiltersModel->getFilter();
+                    $this->phraseModel->editedPageSummaries =
+                        $this->searchfiltersModel->getEditedPageSummaries();
                     $phrase_results = $this->phraseModel->getPhrasePageResults(
                         $query, $limit, $results_per_page, true, $filter,
                         $use_cache_if_possible, $raw, $queue_servers);
diff --git a/css/search.css b/css/search.css
index a780dc7c6..f94f2586d 100755
--- a/css/search.css
+++ b/css/search.css
@@ -881,6 +881,7 @@ p
 }
 .talltextarea
 {
+    font-size:16pt;
     width:100%;
     height:4in;
 }
diff --git a/data/data.db b/data/data.db
index b5d769d22..64a0d20f0 100644
Binary files a/data/data.db and b/data/data.db differ
diff --git a/lib/nword_grams.php b/lib/nword_grams.php
index 35dbac7bb..ad93da51e 100644
--- a/lib/nword_grams.php
+++ b/lib/nword_grams.php
@@ -32,15 +32,6 @@
  */

 if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();}
-
-/**
- *  Load the stem word functions
- */
-foreach(glob(BASE_DIR."/lib/stemmers/*_stemmer.php")
-    as $filename) {
-    require_once $filename;
-}
-
 /**
  * Load the Bloom Filter File
  */
diff --git a/lib/phrase_parser.php b/lib/phrase_parser.php
index f25ae9dd3..5ae2a6fdb 100755
--- a/lib/phrase_parser.php
+++ b/lib/phrase_parser.php
@@ -33,6 +33,10 @@

 if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();}

+foreach(glob(LOCALE_DIR."/*/resources/tokenizer.php")
+    as $filename) {
+    require_once $filename;
+}
 /**
  * Load the n word grams File
  */
@@ -53,13 +57,6 @@ require_once BASE_DIR."/lib/crawl_constants.php";
  */
 class PhraseParser
 {
-    /**
-     * Stemmer objects we've instantiated so far (so don't have to
-     * re-instantiate)
-     * @var array
-     */
-    static $stem_objs;
-
     /**
      * Converts a summary of a web page into a string of space separated words
      *
@@ -235,10 +232,7 @@ class PhraseParser
         $lang = NULL, $orig_and_grams = false)
     {
         global $CHARGRAMS;
-        $tokenizer = LOCALE_DIR."/$lang/resources/tokenizer.php";
-        if(file_exists($tokenizer)) {
-            require_once $tokenizer;
-        }
+
         mb_internal_encoding("UTF-8");
         //split first on puctuation as n word grams shouldn't cross punctuation
         $fragments = mb_split(PUNCT, $string);
@@ -321,10 +315,7 @@ class PhraseParser
     static function getCharGramsTerm($terms, $lang)
     {
         global $CHARGRAMS;
-        $tokenizer = LOCALE_DIR."/$lang/resources/tokenizer.php";
-        if(file_exists($tokenizer)) {
-            require_once $tokenizer;
-        }
+
         mb_internal_encoding("UTF-8");
         if(isset($CHARGRAMS[$lang])) {
             $n = $CHARGRAMS[$lang];
@@ -386,13 +377,7 @@ class PhraseParser
      */
     static function getStemmer($lang)
     {
-        if(isset($stem_objs[$lang])) {
-            return $stem_objs[$lang];
-        }
-        $tokenizer = LOCALE_DIR."/$lang/resources/tokenizer.php";
-        if(file_exists($tokenizer)) {
-            require_once $tokenizer;
-        }
+        $lower_lang = strtolower($lang); //try to avoid case sensitivity issues
         $lang_parts = explode("-", $lang);
         if(isset($lang_parts[1])) {
             $stem_class_name = ucfirst($lang_parts[0]).ucfirst($lang_parts[1]) .
@@ -408,7 +393,6 @@ class PhraseParser
         } else {
             $stem_obj = NULL;
         }
-        $stem_objs[$lang] = $stem_obj;
         return $stem_obj;
     }
 }
diff --git a/lib/upgrade_functions.php b/lib/upgrade_functions.php
index 0f9a34ea0..c6c8f565d 100644
--- a/lib/upgrade_functions.php
+++ b/lib/upgrade_functions.php
@@ -88,7 +88,7 @@ function upgradeDatabaseWorkDirectoryCheck()
  */
 function upgradeDatabaseWorkDirectory()
 {
-    $versions = array(0, 1, 2, 3, 4, 5, 6);
+    $versions = array(0, 1, 2, 3, 4, 5, 6, 7);
     $model = new Model();
     $model->db->selectDB(DB_NAME);
     $sql = "SELECT ID FROM VERSION";
@@ -268,4 +268,20 @@ function upgradeDatabaseVersion6(&$db)
     }
     $db->setWorldPermissionsRecursive(PREP_DIR);
 }
+
+function upgradeDatabaseVersion7(&$db)
+{
+    $db->execute("DELETE FROM VERSION WHERE ID=6");
+    $db->execute("INSERT INTO VERSION VALUES (7)");
+    $db->execute("DELETE FROM ACTIVITY WHERE ACTIVITY_ID=7");
+    $db->execute("INSERT INTO ACTIVITY VALUES (7, 7, 'resultsEditor')");
+    $db->execute("DELETE FROM TRANSLATION WHERE TRANSLATION_ID=7");
+    $db->execute("DELETE FROM TRANSLATION_LOCALE WHERE TRANSLATION_ID=7");
+    $db->execute(
+        "INSERT INTO TRANSLATION VALUES (7,'db_activity_results_editor')");
+    $db->execute(
+        "INSERT INTO TRANSLATION_LOCALE VALUES (7, 1, 'Results Editor')");
+    $db->execute("INSERT INTO TRANSLATION_LOCALE VALUES (7, 5,
+        'Éditeur de résultats')");
+}
 ?>
diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini
index 5e45ed484..ad3fd163e 100755
--- a/locale/ar/configure.ini
+++ b/locale/ar/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "بحث"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/de/configure.ini b/locale/de/configure.ini
index 1ae71b7d7..a2deab471 100755
--- a/locale/de/configure.ini
+++ b/locale/de/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Suche"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini
index 02f65f801..aa4da484c 100755
--- a/locale/en-US/configure.ini
+++ b/locale/en-US/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = "7 days"
 admin_controller_recrawl_14day = "14 days"
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = "Filtered Sites Updated!"
+admin_controller_results_editor_update = "Filter Pages Updated!"
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = "Select a Previously Edited URL"
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = "Result Page Update needs to Specify the URL!"
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = "Result Page Updated!"
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = "Page Loaded!"
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = "Select Machine"
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = "Machine Added!"
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = "Machine Name Already Exists; Please Delete First!"
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = "Missing Fields From Machine Form!"
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = "Machine Name does not Exists!"
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = "Machine in use. Please stop the service running on it!"
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = "Machine Deleted!"
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = "No Log File Found."
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = "Machine&#039;s Servers Updated!"
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = "Unable to Perform Action!"
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = "Select Locale"
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = "Locale Added!"
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = "Locale Does Not Exist!"
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = "Locale Deleted"
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = "Select a page"
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = "Static Page Updated!"
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = "Locale Strings Updated!"
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = "PHP Version 5.3 or Newer"
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = "configs/config.php not web server writable."
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = "Work directory needs to be writable by web server. "
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = "pnp.ini file variable post_max_size should be at least 32M"
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = "The following required items were missing: %s"
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = "The following optional items were missing: %s"
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = "Check Passed."
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = "Using configs/local_config.php so changing work directory above may not work."
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = "Must use an Absolute path for Work Directory"
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!"
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = "Please Name Your robot"
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!"
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = "Unable to Update config.php File!"
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = "Unable to Create Profile!"
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = "Problem Updating Database!"
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = "Profile Updated!"
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = "Please Describe Your Robot"
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = "No Search Index Set For Use!"
 ; search_controller.php line: 380
 search_controller_no_index_set = "No Search Index Set For Use!"
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = "Extracted Title"
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = "Extracted Description"
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = "Extracted Links"
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = "Extracted Allowed To Crawl Paths"
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = "Extracted Disallowed To Crawl Paths"
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = "YioopBot Crawl Delay"
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = "Yioop Cache Page... This page has been modified to add a robots directive,  make links absolute, add extracted summaries, and to highlight query terms."
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = "This cached version of %s was obtained by the Yioop crawler on %s."
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = "Toggle Extracted Page Summaries"
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = "Link Weight:"
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = "Save"
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = "Filter Websites from Results"
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = "Edit Result Page"
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = "Edited Urls:"
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = "Select a previously edited summary"
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = "Load"
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = "URL:"
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = "Title:"
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = "Description"
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = "Reset"
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = "Sites to Filter"
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = "Save Page"
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = "Save"
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = "Filter Websites from Results"
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = "Sites to Filter"
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = "Save Filter"
 ;
 ; signin_element.php line: 63
 signin_element_settings = "Settings"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = "Summary Data stored in Yioop "
 ; search_view.php line: 81
 search_view_title = "Yioop! PHP Search Engine"
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = "Enter the terms you would like to search the web for"
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "Type what you are looking for"
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Search"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "Query Results:"
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "Calculated in %s seconds."
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "Showing results %s - %s of %s"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "Rank: %s "
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "Rel: %s "
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = "Prox: %s"
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "Score %s"
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = "Cached"
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = "View&nbsp;as&nbsp;text"
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "Similar"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = "Inlinks"
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = "More Statistics"
 ;
 ; settings_view.php line: 76
diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt
index 5a165df53..b6bef56f0 100755
--- a/locale/en-US/statistics.txt
+++ b/locale/en-US/statistics.txt
@@ -1 +1 @@
-d:100;
\ No newline at end of file
+d:99;
\ No newline at end of file
diff --git a/locale/es/configure.ini b/locale/es/configure.ini
index edeab2c87..a65529cca 100755
--- a/locale/es/configure.ini
+++ b/locale/es/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Buscar"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini
index 6ca128ebd..6ac3b446f 100755
--- a/locale/fr-FR/configure.ini
+++ b/locale/fr-FR/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "Param&egrave;tres de recherche"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = "Moteur de recherche PHP -Yioop!"
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "Trouvez ce que vous cherchez"
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Rechercher"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "R&eacute;sultats:"
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "Trouver en %s secondes."
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "Affichage de %s - %s sur %s r&eacute;sultats"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "Rang: %s"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "Pertinence: %s"
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = "Proximit&eacute;: %s"
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "Total: %s"
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = "En&nbsp;Cache"
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = "Version&nbsp;texte"
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "Pages&nbsp;similaires"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = "Liens retour"
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/he/configure.ini b/locale/he/configure.ini
index 5f1191671..9cf855c1b 100755
--- a/locale/he/configure.ini
+++ b/locale/he/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = "פרופייל עודכן"
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "חפש"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/he/statistics.txt b/locale/he/statistics.txt
index 09559c0dd..1bdc2c466 100755
--- a/locale/he/statistics.txt
+++ b/locale/he/statistics.txt
@@ -1 +1 @@
-d:11;
\ No newline at end of file
+d:10;
\ No newline at end of file
diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini
index 632c4d97a..01845249f 100755
--- a/locale/hi/configure.ini
+++ b/locale/hi/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = "सारांश डेटा"
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "सेटिंग्स"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "यहाँ लिखें की आप क्या खोजना चाहते हैं!"
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "खोज"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini
index 5594d8995..15342fac0 100755
--- a/locale/in-ID/configure.ini
+++ b/locale/in-ID/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = "Pilih name locale"
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = "Locale telah ditambah"
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = "Locale tidak ditemukan"
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = "Locale telah dihapus"
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Cari"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "Hasil"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "Urutan"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/in-ID/statistics.txt b/locale/in-ID/statistics.txt
index 68101b705..09559c0dd 100755
--- a/locale/in-ID/statistics.txt
+++ b/locale/in-ID/statistics.txt
@@ -1 +1 @@
-d:12;
\ No newline at end of file
+d:11;
\ No newline at end of file
diff --git a/locale/it/configure.ini b/locale/it/configure.ini
index e04ce81cc..14cd835c0 100755
--- a/locale/it/configure.ini
+++ b/locale/it/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Cerca"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini
index b9291cd2f..8db045565 100755
--- a/locale/ja/configure.ini
+++ b/locale/ja/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = "選択ローケル"
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = "ローケルが追加しました"
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = "ローケルは存在しません"
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = "ローケルを削除しました"
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = "ローケルストリングを編集しました"
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。"
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = "ボット名を入力してください。"
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。"
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = "config.phpファイルのできない。更新"
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = "プロフィールを作成できない。"
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = "ディータベースの更新ない"
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = "プロフィールの変更できました。"
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = "ロボットの説明してください。"
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = "％sのこのキャッシュされたバージョンは％sのウィオップから入手しました。"
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "設定"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = "探している情報を入力してください。"
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "探している情報を入力してください。"
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "検索"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "キュエリ結果："
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "%s分で計算しました。"
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "結果表示％s　ー　%s　の　%s"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "ランク：%s"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "関連：%s"
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = "近さ: %s"
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "スコア　%s"
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = "キャッシューしました。"
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = "テクストビュー"
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "同じビュー"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/ja/statistics.txt b/locale/ja/statistics.txt
index 3bd9f6b04..81ea401f0 100755
--- a/locale/ja/statistics.txt
+++ b/locale/ja/statistics.txt
@@ -1 +1 @@
-d:45;
\ No newline at end of file
+d:44;
\ No newline at end of file
diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini
index b81110574..f90465154 100755
--- a/locale/kn/configure.ini
+++ b/locale/kn/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = "ಸೋಸಿದ ವೆಬ್ ಸೈಟಗಳನ್ನು ಪರಿಷ್ಕರಿಸಲಾಯಿತು"
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = "ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = "ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಸೇರಿಸಲಾಗಿದೆ"
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = "ಈ ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = "ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಅಳಿಸಲಾಗಿದೆ "
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = "ಪ್ರದೇಶ ಶಿಷ್ಟತೆಯ ಅಕ್ಷರ ಸಮೂಹವನ್ನು ಪರಿಷ್ಕರಿಸಲಾಯಿತು"
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = "configs/config.php ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಲ್ಲ"
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆ ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಾಗಿರಬೇಕು"
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = "php.ini ಕಡಿತದ ಚರಾಂಶ post_max_size ಕನಿಷ್ಠ ಪಕ್ಷ ೧೬ ಎಂ.ಬಿ. ಇರಬೇಕು"
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = "ಬರುವ ಅವಶ್ಯಕವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = "ಬರುವ ಕಡ್ಡಾಯವಲ್ಲದ ವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆಯಾಗಿದೆ"
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು "
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ನಿಗದಿಪಡಿಸಲಾಗಿದೆ!  ನೀವು ಮರು ಪ್ರವೇಶಿಸಬೇಕಾಗಬಹುದು"
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = "ಉಳಿಸು"
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "ನಿಗದಿಗಳು"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = "ಯೂಪ್!, ಪಿಹೆಚಪಿ ಶೋಧನಾ ಯಂತ್ರ "
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = "ನೀವು ಶೋಧಿಸಬೇಕಾದ ಪದ ವನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ "
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "ನಿಮ್ಮ ಪ್ರಶ್ನೆಯನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ "
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "ಹುಡುಕು"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "ನಿಮ್ಮ ಪ್ರಶ್ನೆಯ ಉತ್ತರಗಳು:"
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "ಲೆಕ್ಕಾಚಾರದ ಸಮಯ %s ಸೆಕೆಂಡು"
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "ತೋರಿಸುತ್ತಿರುವ ಫಲಿತಾಂಶಗಳು %s - %s ಆಫ್ %s"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "ಸ್ಥಾನ: %s"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "ಪ್ರಾಸ್ತಾವಿಕ: %s"
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = "ಸಾನಿಧ್ಯ: %s"
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "ಅಂಕ: %s "
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = "ಸಿದ್ಧ ಸ್ಮೃತಿಕೋಶದಿಂದ ನೋಡಿ"
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = "ಪಠ್ಯ ರೂಪದಲ್ಲಿ ನೋಡಿ"
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "ಸಮಾನರೂಪದ"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = "ಒಳ ಕೊಂಡಿ"
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/kn/statistics.txt b/locale/kn/statistics.txt
index 8698e9b2d..36ca4c26d 100755
--- a/locale/kn/statistics.txt
+++ b/locale/kn/statistics.txt
@@ -1 +1 @@
-d:27;
\ No newline at end of file
+d:25;
\ No newline at end of file
diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini
index a5d949b0c..4f68fbdcc 100755
--- a/locale/ko/configure.ini
+++ b/locale/ko/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = "로케일을 선택하여 주십시요."
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = "로케일 추가!!"
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = "로케일이 존재하지 않습니다."
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = "로케일을 삭제 하였습니다."
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = "로케일 지정 문자열을 업데이트 하였습니다."
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다."
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = "로봇 이름을 정해 주십시요."
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다."
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = "config.php 파일을  업데이트 실패했습니다."
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = "프로필을 생성할수 없습니다."
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = "데이터베이스를 업데이트하는데 문제가 발생했습니다."
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = "당신의 로봇을 기술해 주십시요."
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = "현재 캐시 버젼 %s 은 Yioop 크롤 %s 에 의하여 얻어 졌습니다. "
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "세팅"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = "검색하고 싶은 단어들을 적어 주십시요."
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "찾고자 하는걸 적어 주십시요."
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "검색"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "퀘리 결과"
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "%s 초 결과 완료"
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "결과 %s - %s 의 %s"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "랭크: %s"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "관련성: %s "
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "점수 %s"
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = "캐시 됀것"
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = "일반 텍스트로써 보기"
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "유사성"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = "인링크"
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/ko/statistics.txt b/locale/ko/statistics.txt
index 5f9a99dac..2e3c64c6e 100755
--- a/locale/ko/statistics.txt
+++ b/locale/ko/statistics.txt
@@ -1 +1 @@
-d:47;
\ No newline at end of file
+d:46;
\ No newline at end of file
diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini
index 7692aea73..491897bcd 100755
--- a/locale/pl/configure.ini
+++ b/locale/pl/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Szukaj"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini
index 64e9cc226..9e10744cf 100755
--- a/locale/pt/configure.ini
+++ b/locale/pt/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Pesquisa"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini
index e2a708774..167549d69 100755
--- a/locale/ru/configure.ini
+++ b/locale/ru/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Поиск"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/th/configure.ini b/locale/th/configure.ini
index 3c4d88176..0b54ad276 100755
--- a/locale/th/configure.ini
+++ b/locale/th/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = ""
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini
index 555d50955..d31c3f55a 100755
--- a/locale/tr/configure.ini
+++ b/locale/tr/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = ""
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "Ara"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = ""
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = ""
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = ""
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = ""
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = ""
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = ""
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = ""
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini
index b8d824819..9d362d0f0 100755
--- a/locale/vi-VN/configure.ini
+++ b/locale/vi-VN/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = "Cập nhật c&aacute;c trang web lọc"
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = "Chọn miền địa phương"
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = "Miền địa phương th&ecirc;m v&agrave;o"
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = "Miền địa phương kh&ocirc;ng tồn tại"
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = "X&oacute;a miền địa phương"
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = "Chuỗi Địa phương được cập nhật"
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = "Kiểm tra được th&ocirc;ng qua"
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = "C&ocirc;ng việc thiết lập thư mục bị đ&ocirc;ng cứng (Bạn c&oacute; thể cần phải đăng nhập)"
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = "Đặt t&ecirc;n cho r&ocirc; b&ocirc; của bạn"
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = "Thư mục l&agrave;m việc v&agrave; hồ sơ được tạo ra"
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = "Kh&ocirc;ng thể cập nhật hồ sơ config.php"
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = "Kh&ocirc;ng thể tạo hồ sơ"
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu"
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = "Diễn tả r&ocirc; b&ocirc; của bạn"
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = "Kh&ocirc;ng c&oacute; chỉ mục t&igrave;m k
 ; search_controller.php line: 380
 search_controller_no_index_set = "Kh&ocirc;ng c&oacute; chỉ mục t&igrave;m kiếm thiết lập để sử dụng"
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = "Trang gốc n&agrave;y: %s đ&atilde; t&igrave;m được bởi c&ocirc;ng cụ t&igrave;m kiẽm Yioop v&agrave;o ng&agrave;y %s."
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = "Chuyển đổi chiết xuất trang t&oacute;m tắt"
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "Những c&agrave;i đặt"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = "Đ&aacute;nh v&agrave;o những cụm từ m&agrave; bạn muốn t&igrave;m trang web"
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = "Đ&aacute;nh v&agrave;o c&aacute;i m&agrave; bạn muốn t&igrave;m"
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "T&igrave;m Kiếm"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "Kết Quả:"
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "Đ&atilde; t&iacute;nh to&aacute;n trong %s gi&acirc;y."
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "Cho kết quả tứ %s - %s của %s"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "Thứ Tự: %s"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "Th&iacute;ch hợp: %s"
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = "Gần: %s"
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "Điểm: %s"
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = "Trang&nbsp;gốc"
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = "Trang&nbsp;Web&nbsp;Bắng Chữ"
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "Tương&nbsp;Tự"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/vi-VN/statistics.txt b/locale/vi-VN/statistics.txt
index 9be6a0c6e..e8680e29f 100755
--- a/locale/vi-VN/statistics.txt
+++ b/locale/vi-VN/statistics.txt
@@ -1 +1 @@
-d:43;
\ No newline at end of file
+d:41;
\ No newline at end of file
diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini
index 5eb7d3e6c..e41ad4fbe 100755
--- a/locale/zh-CN/configure.ini
+++ b/locale/zh-CN/configure.ini
@@ -236,117 +236,129 @@ admin_controller_recrawl_7day = ""
 admin_controller_recrawl_14day = ""
 ;
 ; admin_controller.php line: 1446
-admin_controller_site_filter_update = ""
+admin_controller_results_editor_update = ""
+;
+; admin_controller.php line: 1460
+admin_controller_edited_pages = ""
+;
+; admin_controller.php line: 1473
+admin_controller_results_editor_need_url = ""
+;
+; admin_controller.php line: 1479
+admin_controller_results_editor_page_updated = ""
 ;
 ; admin_controller.php line: 1492
+admin_controller_results_editor_page_loaded = ""
+;
+; admin_controller.php line: 1538
 admin_controller_select_machine = ""
 ;
-; admin_controller.php line: 1564
+; admin_controller.php line: 1610
 admin_controller_machine_added = ""
 ;
-; admin_controller.php line: 1571
+; admin_controller.php line: 1617
 admin_controller_machine_exists = ""
 ;
-; admin_controller.php line: 1575
+; admin_controller.php line: 1621
 admin_controller_machine_incomplete = ""
 ;
-; admin_controller.php line: 1584
+; admin_controller.php line: 1630
 admin_controller_machine_doesnt_exists = ""
 ;
-; admin_controller.php line: 1601
+; admin_controller.php line: 1647
 admin_controller_stop_service_first = ""
 ;
-; admin_controller.php line: 1614
+; admin_controller.php line: 1660
 admin_controller_machine_deleted = ""
 ;
-; admin_controller.php line: 1662
+; admin_controller.php line: 1708
 admin_controller_no_machine_log = ""
 ;
-; admin_controller.php line: 1691
+; admin_controller.php line: 1737
 admin_controller_machine_servers_updated = ""
 ;
-; admin_controller.php line: 1695
+; admin_controller.php line: 1741
 admin_controller_machine_no_action = ""
 ;
-; admin_controller.php line: 1726
+; admin_controller.php line: 1772
 admin_controller_select_localename = ""
 ;
-; admin_controller.php line: 1770
+; admin_controller.php line: 1816
 admin_controller_locale_added = ""
 ;
-; admin_controller.php line: 1777
+; admin_controller.php line: 1823
 admin_controller_localename_doesnt_exists = ""
 ;
-; admin_controller.php line: 1786
+; admin_controller.php line: 1832
 admin_controller_localename_deleted = ""
 ;
-; admin_controller.php line: 1795
+; admin_controller.php line: 1841
 admin_controller_select_staticpages = ""
 ;
-; admin_controller.php line: 1814
+; admin_controller.php line: 1860
 admin_controller_staticpage_updated = ""
 ;
-; admin_controller.php line: 1837
+; admin_controller.php line: 1883
 admin_controller_localestrings_updated = ""
 ;
-; admin_controller.php line: 1894
+; admin_controller.php line: 1940
 admin_controller_php_version = ""
 ;
-; admin_controller.php line: 1902
+; admin_controller.php line: 1948
 admin_controller_no_write_config_php = ""
 ;
-; admin_controller.php line: 1907
+; admin_controller.php line: 1953
 admin_controller_no_write_work_dir = ""
 ;
-; admin_controller.php line: 1912
+; admin_controller.php line: 1958
 admin_controller_post_size_small = ""
 ;
-; admin_controller.php line: 1918
+; admin_controller.php line: 1964
 admin_controller_missing_required = ""
 ;
-; admin_controller.php line: 1941
+; admin_controller.php line: 1987
 admin_controller_missing_optional = ""
 ;
-; admin_controller.php line: 1946
+; admin_controller.php line: 1992
 admin_controller_check_passed = ""
 ;
-; admin_controller.php line: 1951
+; admin_controller.php line: 1997
 admin_controller_using_local_config = ""
 ;
-; admin_controller.php line: 2007
+; admin_controller.php line: 2053
 admin_controller_configure_use_absolute_path = ""
 ;
-; admin_controller.php line: 2040
+; admin_controller.php line: 2086
 admin_controller_configure_work_dir_set = ""
 ;
-; admin_controller.php line: 2052
+; admin_controller.php line: 2098
 admin_controller_name_your_bot = ""
 ;
-; admin_controller.php line: 2061
+; admin_controller.php line: 2107
 admin_controller_configure_work_profile_made = ""
 ;
-; admin_controller.php line: 2069
+; admin_controller.php line: 2115
 admin_controller_configure_no_set_config = ""
 ;
-; admin_controller.php line: 2080
+; admin_controller.php line: 2126
 admin_controller_configure_no_create_profile = ""
 ;
-; admin_controller.php line: 2089
+; admin_controller.php line: 2135
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2100
+; admin_controller.php line: 2146
 admin_controller_configure_work_dir_invalid = ""
 ;
-; admin_controller.php line: 2178
+; admin_controller.php line: 2224
 admin_controller_configure_no_change_db = ""
 ;
-; admin_controller.php line: 2192
+; admin_controller.php line: 2238
 admin_controller_configure_profile_change = ""
 ;
-; admin_controller.php line: 2206
+; admin_controller.php line: 2252
 admin_controller_configure_no_change_profile = ""
 ;
-; admin_controller.php line: 2242
+; admin_controller.php line: 2288
 admin_controller_describe_robot = ""
 ;
 ; search_controller.php line: 143
@@ -364,31 +376,31 @@ search_controller_no_index_set = ""
 ; search_controller.php line: 380
 search_controller_no_index_set = ""
 ;
-; search_controller.php line: 789
+; search_controller.php line: 794
 search_controller_extracted_title = ""
 ;
-; search_controller.php line: 791
+; search_controller.php line: 796
 search_controller_extracted_description = ""
 ;
-; search_controller.php line: 793
+; search_controller.php line: 798
 search_controller_extracted_links = ""
 ;
-; search_controller.php line: 798
+; search_controller.php line: 803
 search_controller_extracted_allow_paths = ""
 ;
-; search_controller.php line: 804
+; search_controller.php line: 809
 search_controller_extracted_disallow_paths = ""
 ;
-; search_controller.php line: 810
+; search_controller.php line: 815
 search_controller_crawl_delay = ""
 ;
-; search_controller.php line: 891
+; search_controller.php line: 897
 search_controller_cache_comment = ""
 ;
-; search_controller.php line: 938
+; search_controller.php line: 945
 search_controller_cached_version = ""
 ;
-; search_controller.php line: 952
+; search_controller.php line: 959
 search_controller_summary_data = ""
 ;
 ; settings_controller.php line: 125
@@ -1025,14 +1037,41 @@ pageoptions_element_link_weight = ""
 ; pageoptions_element.php line: 123
 pageoptions_element_save_options = ""
 ;
-; searchfilters_element.php line: 59
-searchfilters_element_filter_websites = ""
+; resultseditor_element.php line: 58
+resultseditor_element_edit_page = ""
+;
+; resultseditor_element.php line: 61
+resultseditor_element_edited_pages = ""
+;
+; resultseditor_element.php line: 70
+resultseditor_element_url_list = ""
+;
+; resultseditor_element.php line: 72
+resultseditor_element_load_page = ""
+;
+; resultseditor_element.php line: 83
+resultseditor_element_page_url = ""
+;
+; resultseditor_element.php line: 90
+resultseditor_element_page_title = ""
+;
+; resultseditor_element.php line: 96
+resultseditor_element_description = ""
+;
+; resultseditor_element.php line: 102
+resultseditor_element_reset = ""
 ;
-; searchfilters_element.php line: 69
-searchfilters_element_sites_to_filter = ""
+; resultseditor_element.php line: 105
+resultseditor_element_save_page = ""
 ;
-; searchfilters_element.php line: 76
-searchfilters_element_save_options = ""
+; resultseditor_element.php line: 108
+resultseditor_element_filter_websites = ""
+;
+; resultseditor_element.php line: 118
+resultseditor_element_sites_to_filter = ""
+;
+; resultseditor_element.php line: 125
+resultseditor_element_save_filter = ""
 ;
 ; signin_element.php line: 63
 signin_element_settings = "設定"
@@ -1128,49 +1167,49 @@ nocache_view_summary_contents = ""
 ; search_view.php line: 81
 search_view_title = ""
 ;
-; search_view.php line: 95
+; search_view.php line: 97
 search_view_input_label = ""
 ;
-; search_view.php line: 98
+; search_view.php line: 100
 search_view_input_placeholder = ""
 ;
-; search_view.php line: 100
+; search_view.php line: 102
 search_view_search = "搜尋"
 ;
-; search_view.php line: 113
+; search_view.php line: 115
 search_view_query_results = "搜尋結果"
 ;
-; search_view.php line: 114
+; search_view.php line: 116
 search_view_calculated = "總計: %s 秒"
 ;
-; search_view.php line: 115
+; search_view.php line: 117
 search_view_results = "結果"
 ;
-; search_view.php line: 147
+; search_view.php line: 149
 search_view_rank = "排名: %s 名"
 ;
-; search_view.php line: 149
+; search_view.php line: 151
 search_view_relevancy = "關聯度:  %s 趴"
 ;
-; search_view.php line: 151
+; search_view.php line: 153
 search_view_proximity = ""
 ;
-; search_view.php line: 153
+; search_view.php line: 155
 search_view_score = "分數"
 ;
-; search_view.php line: 168
+; search_view.php line: 170
 search_view_cache = ""
 ;
-; search_view.php line: 171
+; search_view.php line: 173
 search_view_as_text = ""
 ;
-; search_view.php line: 183
+; search_view.php line: 185
 search_view_similar = "相似"
 ;
-; search_view.php line: 194
+; search_view.php line: 196
 search_view_inlink = ""
 ;
-; search_view.php line: 227
+; search_view.php line: 229
 search_view_more_statistics = ""
 ;
 ; settings_view.php line: 76
diff --git a/locale/zh-CN/statistics.txt b/locale/zh-CN/statistics.txt
index 604edd026..763247d34 100755
--- a/locale/zh-CN/statistics.txt
+++ b/locale/zh-CN/statistics.txt
@@ -1 +1 @@
-d:18;
\ No newline at end of file
+d:17;
\ No newline at end of file
diff --git a/models/model.php b/models/model.php
index d91c45ba1..d73ff2dcd 100755
--- a/models/model.php
+++ b/models/model.php
@@ -86,6 +86,12 @@ class Model implements CrawlConstants
      *  @var string
      */
     var $db_name;
+    /**
+     * Associative array of page summaries which might be used to
+     * override default page summaries if set.
+     * @var array
+     */
+    var $editedPageSummaries = NULL;


     /**
@@ -129,6 +135,25 @@ class Model implements CrawlConstants
         }
         for($i = 0; $i < $num_pages; $i++) {
             $page = $pages[$i];
+            if($this->editedPageSummaries != NULL) {
+                $url_parts = explode("|", $page[self::URL]);
+                if(count($url_parts) > 1) {
+                    $url = trim($url_parts[1]);
+                } else {
+                    $url = $page[self::URL];
+                }
+                $hash_url = crawlHash($url, true);
+                if(isset($this->editedPageSummaries[$hash_url])) {
+                    $summary = $this->editedPageSummaries[$hash_url];
+                    $page[self::URL] = $url;
+                    foreach(array(self::TITLE, self::DESCRIPTION) as $field) {
+                        if(isset($summary[$field])) {
+                            $page[$field] = $summary[$field];
+                        }
+                    }
+
+                }
+            }
             if(!isset($page[self::TITLE])) {
                 $page[self::TITLE] = "";
             }
diff --git a/models/searchfilters_model.php b/models/searchfilters_model.php
index 0ec8caaaf..88fb057cc 100644
--- a/models/searchfilters_model.php
+++ b/models/searchfilters_model.php
@@ -129,5 +129,52 @@ class SearchfiltersModel extends Model implements CrawlConstants
             serialize($hash_urls));

     }
+
+    /**
+     * Save/updates/deletes an override of a search engine result summary
+     * page. The information stored will be used instead of what was actually
+     * in the index when it comes to displaying search results for a page.
+     * It will not be used for looking up results.
+     *
+     * @param string $url url of a result page
+     * @param string $title the title to be used on SERP pages
+     * @param string $description the description from which snippets will
+     *      be generated.
+     */
+    function updateResultPage($url, $title, $description)
+    {
+        $result_pages = array();
+        $file_name = $this->dir_name."/result_pages.txt";
+        if(file_exists($file_name)) {
+            $result_pages = unserialize(file_get_contents($file_name));
+        }
+        $hash_url = crawlHash($url, true);
+        if($title == "" && $description == "") {
+            unset($result_pages[$hash_url]);
+        } else {
+            $result_pages[$hash_url] = array(
+                self::URL => $url, self::TITLE => $title,
+                self::DESCRIPTION => $description);
+        }
+        file_put_contents($file_name, serialize($result_pages));
+    }
+
+    /**
+     * Reads in and returns data on result pages whose summaries should
+     * be altered to something other than whats in the current index.
+     *
+     * @return array of summary pages for url for which the summary page
+     *      is being overrided -- the intention is this is not many
+     *      as how this is being done won't in general scale
+     */
+    function getEditedPageSummaries()
+    {
+        $result_pages = array();
+        $file_name = $this->dir_name."/result_pages.txt";
+        if(file_exists($file_name)) {
+            $result_pages = unserialize(file_get_contents($file_name));
+        }
+        return $result_pages;
+    }
 }
 ?>
diff --git a/views/admin_view.php b/views/admin_view.php
index 585330e25..d2f1d6783 100755
--- a/views/admin_view.php
+++ b/views/admin_view.php
@@ -54,7 +54,7 @@ class AdminView extends View
     var $elements = array("language", "activity", "signin",
         "managecrawls", "manageaccount", "manageusers", "manageroles",
         "mixcrawls", "managelocales", "editlocales", "crawloptions",
-        "editmix", "pageoptions", "searchfilters",
+        "editmix", "pageoptions", "resultseditor",
         "managemachines", "machinelog", "editstatic", "configure");
     /** Names of helper objects that the view uses to help draw itself
      *  @var array
diff --git a/views/elements/resultseditor_element.php b/views/elements/resultseditor_element.php
new file mode 100644
index 000000000..e7b8efd7a
--- /dev/null
+++ b/views/elements/resultseditor_element.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ *  SeekQuarry/Yioop --
+ *  Open Source Pure PHP Search Engine, Crawler, and Indexer
+ *
+ *  Copyright (C) 2009 - 2012  Chris Pollett chris@pollett.org
+ *
+ *  LICENSE:
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  END LICENSE
+ *
+ * @author Chris Pollett chris@pollett.org
+ * @package seek_quarry
+ * @subpackage element
+ * @license http://www.gnu.org/licenses/ GPL3
+ * @link http://www.seekquarry.com/
+ * @copyright 2009 - 2012
+ * @filesource
+ */
+
+if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();}
+
+/**
+ * Element used to control how urls are filtered out of search results
+ * (if desired) after a crawl has already been performed.
+ *
+ * @author Chris Pollett
+ *
+ * @package seek_quarry
+ * @subpackage element
+ */
+
+class ResultsEditorElement extends Element
+{
+
+    /**
+     * Draws the Screen for the Search Filter activity. This activity is
+     * used to filter urls out of the search results
+     *
+     * @param array $data keys used to store disallowed_sites
+     */
+    public function render($data)
+    {
+    ?>
+        <div class="currentactivity">
+        <h2><?php e(tl('resultseditor_element_edit_page'))?></h2>
+        <form id="urlLookupForm" method="post" action=''>
+        <div  class="topmargin"><b><label for="edited-result-pages"><?php
+            e(tl('resultseditor_element_edited_pages'))?></label>
+        <input type="hidden" name="c" value="admin" />
+        <input type="hidden" name="YIOOP_TOKEN" value="<?php
+            e($data['YIOOP_TOKEN']); ?>" />
+        <input type="hidden" name="a" value="resultsEditor" />
+        <input type="hidden" name="arg" value="load_url" />
+        <?php $this->view->optionsHelper->render(
+                "edited-result-pages", "LOAD_URL",
+                $data['URL_LIST'],
+                tl('resultseditor_element_url_list'));
+            ?><button class="buttonbox" type="submit" ><?php
+            e(tl('resultseditor_element_load_page'));
+            ?></button>
+        </div>
+        </form>
+
+        <form id="urlUpdateForm" method="post"
+            action='?c=admin&amp;a=resultsEditor&amp;YIOOP_TOKEN=<?php
+            e($data['YIOOP_TOKEN']); ?>' >
+        <div  class="topmargin">
+        <input type="hidden" name="arg" value="save_page" />
+        <b><label for="urlfield"><?php
+            e(tl('resultseditor_element_page_url'))?></label></b>
+        <input type="text" id="urlfield"
+            name="URL"  class="extrawidefield" value='<?php
+                e($data["URL"]); ?>' />
+        </div>
+        <div  class="topmargin">
+        <b><label for="titlefield"><?php
+            e(tl('resultseditor_element_page_title'))?></label></b>
+        <input type="text" id="titlefield"
+            name="TITLE"  class="extrawidefield" value='<?php
+                e($data["TITLE"]); ?>' />
+        </div>
+        <div class="topmargin"><label for="descriptionfield"><b><?php
+            e(tl('resultseditor_element_description'));
+                ?></b></label></div>
+        <textarea class="talltextarea" id="descriptionfield"
+            name="DESCRIPTION" ><?php e($data['DESCRIPTION']);
+        ?></textarea>
+        <div class="center slightpad"><button class="buttonbox"
+            type="reset"><?php e(tl('resultseditor_element_reset'));
+            ?></button> &nbsp;&nbsp; <button class="buttonbox"
+            type="submit" ><?php
+            e(tl('resultseditor_element_save_page'));
+            ?></button></div>
+        </form>
+        <h2><?php e(tl('resultseditor_element_filter_websites'))?></h2>
+        <form id="searchfiltersForm" method="post" action='?'>
+        <input type="hidden" name="c" value="admin" />
+        <input type="hidden" name="YIOOP_TOKEN" value="<?php
+            e($data['YIOOP_TOKEN']); ?>" />
+        <input type="hidden" name="a" value="resultsEditor" />
+        <input type="hidden" name="arg" value="urlfilter" />
+        <input type="hidden" name="posted" value="posted" />
+
+        <div class="topmargin"><label for="disallowed-sites"><b><?php
+            e(tl('resultseditor_element_sites_to_filter'));
+                ?></b></label></div>
+        <textarea class="talltextarea" id="disallowed-sites"
+            name="disallowed_sites" ><?php e($data['disallowed_sites']);
+        ?></textarea>
+
+        <div class="center slightpad"><button class="buttonbox"
+            type="submit"><?php e(tl('resultseditor_element_save_filter'));
+            ?></button></div>
+        </form>
+        </div>
+
+    <?php
+    }
+}
+?>
diff --git a/views/elements/searchfilters_element.php b/views/elements/searchfilters_element.php
deleted file mode 100644
index 990f96488..000000000
--- a/views/elements/searchfilters_element.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- *  SeekQuarry/Yioop --
- *  Open Source Pure PHP Search Engine, Crawler, and Indexer
- *
- *  Copyright (C) 2009 - 2012  Chris Pollett chris@pollett.org
- *
- *  LICENSE:
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  END LICENSE
- *
- * @author Chris Pollett chris@pollett.org
- * @package seek_quarry
- * @subpackage element
- * @license http://www.gnu.org/licenses/ GPL3
- * @link http://www.seekquarry.com/
- * @copyright 2009 - 2012
- * @filesource
- */
-
-if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();}
-
-/**
- * Element used to control how urls are filtered out of search results
- * (if desired) after a crawl has already been performed.
- *
- * @author Chris Pollett
- *
- * @package seek_quarry
- * @subpackage element
- */
-
-class SearchFiltersElement extends Element
-{
-
-    /**
-     * Draws the Screen for the Search Filter activity. This activity is
-     * used to filter urls out of the search results
-     *
-     * @param array $data keys used to store disallowed_sites
-     */
-    public function render($data)
-    {
-    ?>
-        <div class="currentactivity">
-
-        <h2><?php e(tl('searchfilters_element_filter_websites'))?></h2>
-        <form id="searchfiltersForm" method="post" action='?'>
-        <input type="hidden" name="c" value="admin" />
-        <input type="hidden" name="YIOOP_TOKEN" value="<?php
-            e($data['YIOOP_TOKEN']); ?>" />
-        <input type="hidden" name="a" value="searchFilters" />
-        <input type="hidden" name="arg" value="options" />
-        <input type="hidden" name="posted" value="posted" />
-
-        <div class="topmargin"><label for="disallowed-sites"><b><?php
-            e(tl('searchfilters_element_sites_to_filter'));
-                ?></b></label></div>
-        <textarea class="shorttextarea" id="disallowed-sites"
-            name="disallowed_sites" ><?php e($data['disallowed_sites']);
-        ?></textarea>
-
-        <div class="center slightpad"><button class="buttonbox"
-            type="submit"><?php e(tl('searchfilters_element_save_options'));
-            ?></button></div>
-        </form>
-        </div>
-
-    <?php
-    }
-}
-?>