diff --git a/trunk/fred.pro b/trunk/fred.pro
index 7b49b11..481722b 100644
--- a/trunk/fred.pro
+++ b/trunk/fred.pro
@@ -1,119 +1,119 @@
 #*******************************************************************************
 # fred Copyright (c) 2011-2013 by Gillen Daniel <gillen.dan@pinguin.lu>        *
 #                                                                              *
 # Forensic Registry EDitor (fred) is a cross-platform M$ registry hive editor  *
 # with special feautures useful during forensic analysis.                      *
 #                                                                              *
 # 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/>.                    *
 #******************************************************************************/
 
 # Generate compileinfo.h
 system(bash compileinfo.sh > compileinfo.h)
 #compileinfo.target   = compileinfo.h
 #compileinfo.commands = $$PWD/compileinfo.sh > compileinfo.h
 #QMAKE_EXTRA_TARGETS += compileinfo
 #PRE_TARGETDEPS      += compileinfo.h
 
 # Build fred
 
 QMAKE_CXXFLAGS  += -Wall
 
 QT        += core \
              gui \
              script \
              webkit
 
 CONFIG    += console
 
 TARGET     = fred
 
 TEMPLATE   = app
 
 SOURCES   += main.cpp\
              mainwindow.cpp \
              registrynode.cpp \
              registrynodetreemodel.cpp \
              registrykey.cpp \
              registrykeytablemodel.cpp \
              dlgabout.cpp \
              dlgkeydetails.cpp \
              qhexedit/qhexedit_p.cpp \
              qhexedit/qhexedit.cpp \
              reporttemplate.cpp \
              datareporter.cpp \
              datareporterengine.cpp \
              registryhive.cpp \
              qtscript_types/bytearray.cpp \
              qtscript_types/bytearrayprototype.cpp \
              qtscript_types/bytearrayiterator.cpp \
              dlgreportviewer.cpp \
              registrykeytable.cpp \
              registrynodetree.cpp \
              dlgsearch.cpp \
              threadsearch.cpp \
              searchresultwidget.cpp \
              tabwidget.cpp \
              argparser.cpp \
              datainterpretertable.cpp \
              datainterpreterwidget.cpp \
              hexeditwidget.cpp \
              settings.cpp \
-    searchresulttabledelegate.cpp \
-    registrynodetreemodelproxy.cpp
+             searchresulttabledelegate.cpp \
+             registrynodetreemodelproxy.cpp
 
 HEADERS   += mainwindow.h \
              registrynode.h \
              registrynodetreemodel.h \
              registrykey.h \
              registrykeytablemodel.h \
              dlgabout.h \
              dlgkeydetails.h \
              qhexedit/qhexedit_p.h \
              qhexedit/qhexedit.h \
              reporttemplate.h \
              datareporter.h \
              datareporterengine.h \
              registryhive.h \
              qtscript_types/bytearray.h \
              qtscript_types/bytearrayprototype.h \
              qtscript_types/bytearrayiterator.h \
              dlgreportviewer.h \
              registrykeytable.h \
              registrynodetree.h \
              dlgsearch.h \
              threadsearch.h \
              searchresultwidget.h \
              tabwidget.h \
              argparser.h \
              datainterpretertable.h \
              datainterpreterwidget.h \
              hexeditwidget.h \
              settings.h \
-    searchresulttabledelegate.h \
-    registrynodetreemodelproxy.h
+             searchresulttabledelegate.h \
+             registrynodetreemodelproxy.h
 
 FORMS     += mainwindow.ui \
              dlgabout.ui \
              dlgkeydetails.ui \
              dlgreportviewer.ui \
              dlgsearch.ui
 
 #LIBS      += -lhivex
 LIBS      += $$PWD/hivex/lib/.libs/libhivex.a
 
 #DEFINES   += __STDC_FORMAT_MACROS
 
 RESOURCES += fred.qrc
 RC_FILE    = fred.rc
 ICON       = resources/fred.icns
diff --git a/trunk/mainwindow.cpp b/trunk/mainwindow.cpp
index 2fd9c9c..f6d6425 100644
--- a/trunk/mainwindow.cpp
+++ b/trunk/mainwindow.cpp
@@ -1,564 +1,575 @@
 /*******************************************************************************
 * fred Copyright (c) 2011-2013 by Gillen Daniel <gillen.dan@pinguin.lu>        *
 *                                                                              *
 * Forensic Registry EDitor (fred) is a cross-platform M$ registry hive editor  *
 * with special feautures useful during forensic analysis.                      *
 *                                                                              *
 * 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/>.                    *
 *******************************************************************************/
 
 #ifndef FRED_REPORT_TEMPLATE_DIR
   #ifndef __MINGW32__
     #define FRED_REPORT_TEMPLATE_DIR "/usr/share/fred/report_templates/"
   #else
     #define FRED_REPORT_TEMPLATE_DIR ".\\report_templates\\"
   #endif
 #endif
 
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QStringList>
 #include <QDesktopWidget>
 #include <QDir>
 #include <QSplitter>
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "dlgabout.h"
 #include "dlgkeydetails.h"
 #include "dlgreportviewer.h"
 #include "dlgsearch.h"
 
 #include "compileinfo.h"
 
 MainWindow::MainWindow(ArgParser *p_arg_parser) :
   QMainWindow(0), ui(new Ui::MainWindow)
 {
   ui->setupUi(this);
 
   // Initialize private vars
   this->p_args=p_arg_parser;
   this->p_hive=new RegistryHive(this);
   this->is_hive_open=false;
   this->p_reg_node_tree_model=NULL;
+  this->p_reg_node_tree_model_proxy=NULL;
   this->p_reg_key_table_model=NULL;
   this->p_search_thread=NULL;
   this->search_result_widgets.clear();
 
   // Check for ~/.fred config dir
   this->CheckUserConfigDir();
 
   // Set main window size
   int cur_screen=QApplication::desktop()->screenNumber(this);
   int window_width=
     QApplication::desktop()->availableGeometry(cur_screen).width()*0.5;
   int window_height=
     QApplication::desktop()->availableGeometry(cur_screen).height()*0.5;
   int window_x=
     (QApplication::desktop()->availableGeometry(cur_screen).width()/2)-
     (window_width/2);
   int window_y=
     (QApplication::desktop()->availableGeometry(cur_screen).height()/2)-
     (window_height/2);
   this->setGeometry(window_x,
                     window_y,
                     window_width,
                     window_height);
 
   // Create widgets
   this->p_horizontal_splitter=new QSplitter();
   this->p_horizontal_splitter->setOrientation(Qt::Horizontal);
 
   this->p_node_tree=new RegistryNodeTree(this->p_horizontal_splitter);
   this->p_node_tree->setHeaderHidden(true);
 
   this->p_vertical_splitter=new QSplitter(this->p_horizontal_splitter);
   this->p_vertical_splitter->setOrientation(Qt::Vertical);
 
   this->p_key_table=new RegistryKeyTable(this->p_vertical_splitter);
 
   this->p_tab_widget=new TabWidget(this->p_vertical_splitter);
 
   this->p_hex_edit_widget=new HexEditWidget();
 
   // Add hexedit page to tab_widget
   this->p_tab_widget->addTab(this->p_hex_edit_widget,tr("Hex viewer"));
 
   // Add widgets to their splitters
   this->p_vertical_splitter->addWidget(this->p_key_table);
   this->p_vertical_splitter->addWidget(this->p_tab_widget);
 
   this->p_horizontal_splitter->addWidget(this->p_node_tree);
   this->p_horizontal_splitter->addWidget(this->p_vertical_splitter);
 
   // Set stretch factors
   QSizePolicy node_tree_policy=this->p_node_tree->sizePolicy();
   node_tree_policy.setHorizontalStretch(1);
   node_tree_policy.setVerticalStretch(100);
   this->p_node_tree->setSizePolicy(node_tree_policy);
 
   QSizePolicy vertical_splitter_policy=this->p_vertical_splitter->sizePolicy();
   vertical_splitter_policy.setHorizontalStretch(4);
   vertical_splitter_policy.setVerticalStretch(100);
   this->p_vertical_splitter->setSizePolicy(vertical_splitter_policy);
 
   QSizePolicy key_table_policy=this->p_key_table->sizePolicy();
   key_table_policy.setVerticalStretch(5);
   key_table_policy.setHorizontalStretch(100);
   this->p_key_table->setSizePolicy(key_table_policy);
 
   QSizePolicy tab_widget_policy=this->p_tab_widget->sizePolicy();
   tab_widget_policy.setVerticalStretch(2);
   tab_widget_policy.setHorizontalStretch(200);
   this->p_tab_widget->setSizePolicy(tab_widget_policy);
 
   // Connect signals
   this->connect(this->p_node_tree,
                 SIGNAL(clicked(QModelIndex)),
                 this,
                 SLOT(SlotNodeTreeClicked(QModelIndex)));
   this->connect(this->p_node_tree,
                 SIGNAL(activated(QModelIndex)),
                 this,
                 SLOT(SlotNodeTreeClicked(QModelIndex)));
   this->connect(this->p_node_tree,
                 SIGNAL(CurrentItemChanged(QModelIndex)),
                 this,
                 SLOT(SlotNodeTreeClicked(QModelIndex)));
   this->connect(this->p_key_table,
                 SIGNAL(clicked(QModelIndex)),
                 this,
                 SLOT(SlotKeyTableClicked(QModelIndex)));
   this->connect(this->p_key_table,
                 SIGNAL(doubleClicked(QModelIndex)),
                 this,
                 SLOT(SlotKeyTableDoubleClicked(QModelIndex)));
   this->connect(this->p_key_table,
                 SIGNAL(CurrentItemChanged(QModelIndex)),
                 this,
                 SLOT(SlotKeyTableClicked(QModelIndex)));
   this->connect(this->p_tab_widget,
                 SIGNAL(tabCloseRequested(int)),
                 this,
                 SLOT(SlotTabCloseButtonClicked(int)));
 
   // Add central widget
   this->setCentralWidget(this->p_horizontal_splitter);
   this->centralWidget()->setContentsMargins(4,4,4,0);
 
   // Set window title
   this->UpdateWindowTitle();
 
   // Set last open location to home dir
   this->last_open_location=QDir::homePath();
 
   // Load report templates and update menu
   this->p_data_reporter=new DataReporter();
   // Load reports from system wide include dir
   this->p_data_reporter->LoadReportTemplates(FRED_REPORT_TEMPLATE_DIR);
   // Load user's report templates
   this->p_data_reporter->LoadReportTemplates(QDir::homePath()
                                                .append(QDir::separator())
                                                .append(".fred")
                                                .append(QDir::separator())
                                                .append("report_templates"));
   this->UpdateDataReporterMenu();
 
   // Finally, react on some command line arguments
   if(this->p_args->IsSet("maximized")) {
     this->setWindowState(Qt::WindowMaximized);
   }
   if(this->p_args->IsSet("fullscreen")) {
     this->setWindowState(Qt::WindowFullScreen);
   }
   if(this->p_args->IsSet("hive-file")) {
     this->OpenHive(this->p_args->GetArgVal("hive-file"));
   }
 }
 
 MainWindow::~MainWindow() {
   if(this->is_hive_open) {
     this->p_hive->Close();
   }
   delete ui;
 }
 
 void MainWindow::on_action_Quit_triggered() {
   qApp->exit();
 }
 
 void MainWindow::on_action_Open_hive_triggered() {
   QString hive_file="";
 
   hive_file=QFileDialog::getOpenFileName(this,
                                     tr("Open registry hive"),
                                     this->last_open_location,
                                     tr("All files (*)"));
   if(hive_file=="") return;
 
   this->OpenHive(hive_file);
 }
 
 void MainWindow::on_action_Close_hive_triggered() {
   if(this->is_hive_open) {
     // Remove search results
     while(this->p_tab_widget->count()>1) {
       this->p_tab_widget->removeTab(this->p_tab_widget->count()-1);
       delete this->search_result_widgets.at(this->p_tab_widget->count()-1);
       this->search_result_widgets.removeLast();
     }
 
     // Delete models
     if(this->p_reg_node_tree_model!=NULL) {
       this->p_node_tree->setModel(NULL);
+      delete this->p_reg_node_tree_model_proxy;
       delete this->p_reg_node_tree_model;
+      this->p_reg_node_tree_model_proxy=NULL;
       this->p_reg_node_tree_model=NULL;
     }
     if(this->p_reg_key_table_model!=NULL) {
       this->p_key_table->setModel(NULL);
       delete this->p_reg_key_table_model;
       this->p_reg_key_table_model=NULL;
     }
 
     // Remove any data from hex edit and data interpreter
     this->p_hex_edit_widget->SetData(QByteArray());
     this->p_hex_edit_widget->setEnabled(false);
 
     // Close hive
     this->p_hive->Close();
 
     this->is_hive_open=false;
     this->ui->action_Close_hive->setEnabled(false);
     this->ui->ActionSearch->setEnabled(false);
     this->ui->MenuReports->setEnabled(false);
     this->UpdateWindowTitle();
   }
 }
 
 void MainWindow::on_actionAbout_Qt_triggered() {
   QMessageBox::aboutQt(this,tr("About Qt"));
 }
 
 void MainWindow::on_actionAbout_fred_triggered() {
   DlgAbout dlg_about(this);
   dlg_about.exec();
 }
 
 void MainWindow::on_ActionSearch_triggered() {
   DlgSearch dlg_search(this);
   if(dlg_search.exec()==QDialog::Accepted) {
     // Create search thread and connect needed signals/slots
     this->p_search_thread=new ThreadSearch(this);
 
     // Add new search widget to tabwidget and to internal widget list
     SearchResultWidget *p_search_widget=
       new SearchResultWidget(this->p_tab_widget);
     p_search_widget->setEnabled(false);
     this->search_result_widgets.append(p_search_widget);
 
     this->connect(p_search_widget,
                   SIGNAL(doubleClicked(QModelIndex)),
                   this,
                   SLOT(SlotSearchResultWidgetDoubleClicked(QModelIndex)));
 
     this->p_tab_widget->addTab(p_search_widget,tr("Search results"),true);
     this->p_tab_widget->setCurrentIndex(this->p_tab_widget->count()-1);
 
     // Connect search thread to result widget
     this->connect(this->p_search_thread,
                   SIGNAL(SignalFoundMatch(ThreadSearch::eMatchType,
                                           QString,QString,QString)),
                   p_search_widget,
                   SLOT(SlotFoundMatch(ThreadSearch::eMatchType,
                                       QString,QString,QString)));
     this->connect(this->p_search_thread,
                   SIGNAL(finished()),
                   this,
                   SLOT(SlotSearchFinished()));
     this->connect(this->p_search_thread,
                   SIGNAL(finished()),
                   p_search_widget,
                   SLOT(SlotSearchFinished()));
 
     // Start searching
     this->ui->ActionSearch->setEnabled(false);
     p_search_thread->Search(this->p_hive->Filename(),
                             dlg_search.Keywords(),
                             dlg_search.SearchNodeNames(),
                             dlg_search.SearchKeyNames(),
                             dlg_search.SearchKeyValues());
   }
 }
 
 void MainWindow::SlotNodeTreeClicked(QModelIndex index) {
   QString node_path;
 
   if(!index.isValid()) return;
 
+  // Map proxy index to tree model index
+  index=this->p_reg_node_tree_model_proxy->mapToSource(index);
+
   // Built node path
   node_path=this->p_reg_node_tree_model->GetNodePath(index);
 
   // Create table model and attach it to the table view
   if(this->p_reg_key_table_model!=NULL) {
     // If a previous model was set, delete it and clear hexedit etc...
     this->p_key_table->setModel(NULL);
     delete this->p_reg_key_table_model;
     this->p_hex_edit_widget->SetData(QByteArray());
   }
   this->p_reg_key_table_model=new RegistryKeyTableModel(this->p_hive,node_path);
   this->p_key_table->setModel(this->p_reg_key_table_model);
   // Set focus back to nodetree to be able to navigate with keyboard
   this->p_node_tree->setFocus();
 }
 
 void MainWindow::SlotKeyTableDoubleClicked(QModelIndex index) {
   Q_UNUSED(index);
   /*
   QModelIndex key_index;
   QModelIndex node_index;
   QStringList nodes;
 
   QString key_name;
   QString key_type;
   QByteArray key_value;
 
   if(!index.isValid()) return;
 
   // Get key name, type and value
   key_index=this->p_reg_key_table_model->index(index.row(),0);
   key_name=this->p_reg_key_table_model->data(key_index,Qt::DisplayRole)
     .toString();
   key_index=this->p_reg_key_table_model->index(index.row(),1);
   key_type=this->p_reg_key_table_model->data(key_index,Qt::DisplayRole)
     .toString();ThreadSearch
   key_index=this->p_reg_key_table_model->index(index.row(),2);
   key_value=this->p_reg_key_table_model->data(key_index,
                                               RegistryKeyTableModel::
                                                 AdditionalRoles_GetRawData)
     .toByteArray();
 
   // Get current node
   node_index=this->p_node_tree->currentIndex();
 
   //Built node path
   nodes.clear();
   nodes.append(this->p_reg_node_tree_model->
                  data(node_index,Qt::DisplayRole).toString());
   while(this->p_reg_node_tree_model->parent(node_index)!=QModelIndex()) {
     // Prepend all parent nodes
     node_index=this->p_reg_node_tree_model->parent(node_index);
     nodes.prepend(this->p_reg_node_tree_model->
                   data(node_index,Qt::DisplayRole).toString());
   }
 
   DlgKeyDetails dlg_key_details(this);
   dlg_key_details.SetValues(nodes,key_name,key_type,key_value);
   dlg_key_details.exec();
   */
 }
 
 void MainWindow::SlotKeyTableClicked(QModelIndex index) {
   if(!index.isValid()) return;
 
   this->selected_key_value=
     this->p_reg_key_table_model->data(this->p_reg_key_table_model->
                                         index(index.row(),2),
                                       RegistryKeyTableModel::
                                         AdditionalRoles_GetRawData)
                                           .toByteArray();
   this->p_hex_edit_widget->SetData(this->selected_key_value);
   // Set focus back to nodetree to be able to navigate with keyboard
   this->p_key_table->setFocus();
 }
 
 void MainWindow::SlotReportClicked() {
   // Get report category and name from sender and it's parent
   QString category=((QMenu*)((QAction*)QObject::sender())->parent())->title();
   QString report=((QAction*)QObject::sender())->text();
 
   // Generate report
   QString report_content=this->p_data_reporter->GenerateReport(this->p_hive,
                                                                category,
                                                                report);
 
   // Show result in report viewer
   if(report_content!=QString()) {
     DlgReportViewer *p_dlg_report_view=new DlgReportViewer(report_content,this);
     p_dlg_report_view->exec();
     delete p_dlg_report_view;
   } else {
     // TODO: Something went wrong!
   }
 }
 
 void MainWindow::SlotSearchFinished() {
   delete this->p_search_thread;
   this->p_search_thread=NULL;
   this->ui->ActionSearch->setEnabled(true);
   // Enable result widget
   this->search_result_widgets.last()->setEnabled(true);
 }
 
 void MainWindow::SlotSearchResultWidgetDoubleClicked(QModelIndex index) {
   SearchResultWidget *p_sender;
   QString path;
   QString match_type;
   QString value;
   QString key="";
   int i;
 
   if(!index.isValid()) return;
 
   // Get pointer to sender
   p_sender=(SearchResultWidget*)QObject::sender();
 
   // Get path and matchtype
   path=p_sender->item(index.row(),0)->text();
   match_type=p_sender->item(index.row(),1)->text();
   value=p_sender->item(index.row(),2)->text();
 
   if(match_type==tr("Node name")) {
     // Node name is not part of path. Add it
     if(path=="\\") path.append(value);
     else path.append("\\").append(value);
   } else if(match_type==tr("Key name")) {
     // Key name is stored in value
     key=value;
   } else if(match_type==tr("Key value")) {
     // Key name is part of path. Save and remove it
     QStringList nodes=path.split("\\",QString::SkipEmptyParts);
     key=nodes.at(nodes.count()-1);
     // Remove \<key name> from path
     path.chop(key.length()+1);
   }
 
   // Expand treeview to correct node
   QList<QModelIndex> indexes=
     this->p_reg_node_tree_model->GetIndexListOf(path);
   for(i=0;i<indexes.count();i++) {
+    indexes.replace(i,this->p_reg_node_tree_model_proxy->
+                        mapFromSource(indexes.at(i)));
     this->p_node_tree->expand(indexes.at(i));
   }
   if(indexes.count()>0) {
     // Scroll to last expanded node, select it and update widgets
     this->p_node_tree->scrollTo(indexes.at(indexes.count()-1),
                                 QAbstractItemView::PositionAtCenter);
     this->p_node_tree->selectionModel()->clear();
     this->p_node_tree->selectionModel()->
       select(indexes.at(indexes.count()-1),
              QItemSelectionModel::Select);
     // TODO: This does not work!!
     this->SlotNodeTreeClicked(indexes.at(indexes.count()-1));
   }
 
   // Select correct key if search matched on keay name / value
   if(key!="") {
     int row=this->p_reg_key_table_model->GetKeyRow(key);
     this->p_key_table->clearSelection();
     this->p_key_table->scrollTo(this->p_reg_key_table_model->index(row,0),
                                 QAbstractItemView::PositionAtCenter);
     this->p_key_table->selectRow(row);
     this->SlotKeyTableClicked(this->p_reg_key_table_model->index(row,0));
   }
 }
 
 void MainWindow::SlotTabCloseButtonClicked(int index) {
   // Delete tab widget and remove tab
   this->p_tab_widget->removeTab(index);
   delete this->search_result_widgets.at(index-1);
   this->search_result_widgets.removeAt(index-1);
 }
 
 void MainWindow::CheckUserConfigDir() {
   QString user_config_dir=QDir::homePath()
                             .append(QDir::separator())
                             .append(".fred");
   if(!QDir(user_config_dir).exists()) {
     // User config dir does not exists, try to create it
     if(!QDir().mkpath(user_config_dir)) {
       // TODO: Maybe warn user
       return;
     }
     user_config_dir.append(QDir::separator()).append("report_templates");
     if(!QDir().mkpath(user_config_dir)) {
       // TODO: Maybe warn user
       return;
     }
   }
 }
 
 void MainWindow::UpdateWindowTitle(QString filename) {
   if(filename=="") {
     this->setWindowTitle(QString("%1 v%2").arg(APP_TITLE,APP_VERSION));
   } else {
     this->setWindowTitle(QString("%1 v%2 - %3").arg(APP_TITLE,
                                                     APP_VERSION,
                                                     filename.toLocal8Bit()
                                                       .constData()));
   }
 }
 
 void MainWindow::UpdateDataReporterMenu() {
   int i=0,ii=0;
   QMenu *p_category_entry;
   QAction *p_report_entry;
   QStringList categories=this->p_data_reporter->GetAvailableReportCategories();
   QStringList reports;
 
   for(i=0;i<categories.count();i++) {
     // First create category submenu
     p_category_entry=this->ui->MenuReports->addMenu(categories.value(i));
     // Now add category reports
     reports=this->p_data_reporter->GetAvailableReports(categories.value(i));
     for(ii=0;ii<reports.count();ii++) {
       p_report_entry=new QAction(reports.value(ii),p_category_entry);
       p_category_entry->addAction(p_report_entry);
       this->connect(p_report_entry,
                     SIGNAL(triggered()),
                     this,
                     SLOT(SlotReportClicked()));
     }
   }
 }
 
 void MainWindow::OpenHive(QString hive_file) {
   // Update last open location
   this->last_open_location=hive_file.left(hive_file.
                                             lastIndexOf(QDir::separator()));
 
   // If another hive is currently open, close it
   if(this->is_hive_open) this->on_action_Close_hive_triggered();
 
   // Try to open hive
   if(!this->p_hive->Open(hive_file)) {
     QMessageBox::critical(this,
                           tr("Error opening hive file"),
                           tr("Unable to open file '%1'").arg(hive_file));
     return;
   }
 
-  // Create tree model
-  this->p_reg_node_tree_model=
-    new RegistryNodeTreeModel(this->p_hive);
-  this->p_node_tree->setModel(this->p_reg_node_tree_model);
+  // Create tree model & proxy
+  this->p_reg_node_tree_model=new RegistryNodeTreeModel(this->p_hive);
+  this->p_reg_node_tree_model_proxy=new RegistryNodeTreeModelProxy(this);
+  //this->p_reg_node_tree_model_proxy->setDynamicSortFilter(true);
+  this->p_reg_node_tree_model_proxy->
+    setSourceModel(this->p_reg_node_tree_model);
+  this->p_node_tree->setModel(this->p_reg_node_tree_model_proxy);
 
   this->is_hive_open=true;
   this->ui->action_Close_hive->setEnabled(true);
   this->ui->ActionSearch->setEnabled(true);
   this->ui->MenuReports->setEnabled(true);
 
   // Enable data interpreter
   this->p_hex_edit_widget->setEnabled(true);
 
   this->UpdateWindowTitle(hive_file);
 }
diff --git a/trunk/mainwindow.h b/trunk/mainwindow.h
index 926d869..d14ccc8 100644
--- a/trunk/mainwindow.h
+++ b/trunk/mainwindow.h
@@ -1,123 +1,127 @@
 /*******************************************************************************
 * fred Copyright (c) 2011-2013 by Gillen Daniel <gillen.dan@pinguin.lu>        *
 *                                                                              *
 * Forensic Registry EDitor (fred) is a cross-platform M$ registry hive editor  *
 * with special feautures useful during forensic analysis.                      *
 *                                                                              *
 * 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/>.                    *
 *******************************************************************************/
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <QMainWindow>
 #include <QWidget>
 #include <QLabel>
 #include <QTabWidget>
 #include <QVBoxLayout>
 #include <QSplitter>
 
 #include <QString>
 #include <QByteArray>
 
 #include <hivex.h>
 
 #include "argparser.h"
 #include "registryhive.h"
 #include "registrynodetree.h"
 #include "registrynodetreemodel.h"
+#include "registrynodetreemodelproxy.h"
 #include "registrykeytable.h"
 #include "registrykeytablemodel.h"
 #include "hexeditwidget.h"
 #include "datareporter.h"
 #include "threadsearch.h"
 #include "searchresultwidget.h"
 #include "tabwidget.h"
 
 namespace Ui {
   class MainWindow;
 }
 
 class MainWindow : public QMainWindow {
   Q_OBJECT
 
   public:
     explicit MainWindow(ArgParser *p_arg_parser);
     ~MainWindow();
 
   private slots:
     void on_action_Quit_triggered();
     void on_action_Open_hive_triggered();
     void on_action_Close_hive_triggered();
     void on_actionAbout_Qt_triggered();
     void on_actionAbout_fred_triggered();
     void on_ActionSearch_triggered();
 
     void SlotNodeTreeClicked(QModelIndex index);
     void SlotKeyTableClicked(QModelIndex index);
     void SlotKeyTableDoubleClicked(QModelIndex index);
     void SlotReportClicked();
     void SlotSearchFinished();
     void SlotSearchResultWidgetDoubleClicked(QModelIndex index);
     void SlotTabCloseButtonClicked(int index);
 
 private:
     Ui::MainWindow *ui;
     ArgParser *p_args;
     QString last_open_location;
     RegistryHive *p_hive;
     bool is_hive_open;
-    RegistryNodeTreeModel *p_reg_node_tree_model;
-    RegistryKeyTableModel *p_reg_key_table_model;
     QByteArray selected_key_value;
     QList<SearchResultWidget*> search_result_widgets;
 
+    // Models
+    RegistryNodeTreeModel *p_reg_node_tree_model;
+    RegistryNodeTreeModelProxy *p_reg_node_tree_model_proxy;
+    RegistryKeyTableModel *p_reg_key_table_model;
+
     // Widgets etc...
     RegistryNodeTree *p_node_tree;
     RegistryKeyTable *p_key_table;
     TabWidget *p_tab_widget;
-
     HexEditWidget *p_hex_edit_widget;
-
     QSplitter *p_horizontal_splitter;
     QSplitter *p_vertical_splitter;
     DataReporter *p_data_reporter;
+
+    // Threads
     ThreadSearch *p_search_thread;
 
     /*
      * CheckUserConfigDir
      *
      * Checks for and possibly creates the ~/.fred directory
      */
     void CheckUserConfigDir();
     /*
      * UpdateWindowTitle
      *
      * Updates the window title
      */
     void UpdateWindowTitle(QString filename="");
     /*
      * UpdateDataReporterMenu
      *
      */
     void UpdateDataReporterMenu();
     /*
      * OpenHive
      *
      * Open a registry hive
      */
     void OpenHive(QString hive_file);
 };
 
 #endif // MAINWINDOW_H
diff --git a/trunk/registrynodetree.cpp b/trunk/registrynodetree.cpp
index 2eb63a1..bb3c138 100644
--- a/trunk/registrynodetree.cpp
+++ b/trunk/registrynodetree.cpp
@@ -1,144 +1,146 @@
 /*******************************************************************************
 * fred Copyright (c) 2011-2013 by Gillen Daniel <gillen.dan@pinguin.lu>        *
 *                                                                              *
 * Forensic Registry EDitor (fred) is a cross-platform M$ registry hive editor  *
 * with special feautures useful during forensic analysis.                      *
 *                                                                              *
 * 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/>.                    *
 *******************************************************************************/
 
 #include "registrynodetree.h"
 #include "registrynodetreemodel.h"
 
 #include <QHeaderView>
 #include <QApplication>
 #include <QClipboard>
 
 RegistryNodeTree::RegistryNodeTree(QWidget *p_parent) : QTreeView(p_parent) {
   // Configure widget
   this->setTextElideMode(Qt::ElideNone);
-//  this->sortByColumn(0,Qt::AscendingOrder);
-//  this->setSortingEnabled(true);
+  this->sortByColumn(0,Qt::AscendingOrder);
+  this->setSortingEnabled(true);
 
   // Create proxy model
-  this->p_model_proxy=new RegistryNodeTreeModelProxy(this);
+//  this->p_model_proxy=new RegistryNodeTreeModelProxy(this);
+//  this->p_model_proxy->setDynamicSortFilter(true);
 
   // Create context menu
   this->p_menu_copy=new QMenu(tr("Copy"),this);
   this->p_action_copy_node_name=new QAction(tr("Node name"),
                                             this->p_menu_copy);
   this->p_menu_copy->addAction(this->p_action_copy_node_name);
   this->connect(this->p_action_copy_node_name,
                 SIGNAL(triggered()),
                 this,
                 SLOT(SlotCopyNodeName()));
   this->p_action_copy_node_path=new QAction(tr("Node path"),
                                             this->p_menu_copy);
   this->p_menu_copy->addAction(this->p_action_copy_node_path);
   this->connect(this->p_action_copy_node_path,
                 SIGNAL(triggered()),
                 this,
                 SLOT(SlotCopyNodePath()));
 }
 
 RegistryNodeTree::~RegistryNodeTree() {
   // Delete our proxy model
-  delete this->p_model_proxy;
+//  delete this->p_model_proxy;
   // Delete context menu
   delete this->p_action_copy_node_name;
   delete this->p_action_copy_node_path;
   delete this->p_menu_copy;
 }
 
 void RegistryNodeTree::setModel(QAbstractItemModel *p_model) {
-  if(p_model!=NULL) {
-    // Assign model to our proxy model
-    this->p_model_proxy->setSourceModel(p_model);
-    // Then assign proxy as our own model
-    QTreeView::setModel(p_model);
-  } else {
-    QTreeView::setModel(p_model);
-  }
+  // Assign model to our proxy model
+//  this->p_model_proxy->setSourceModel(p_model);
+  // Then assign proxy as our own model
+//  QTreeView::setModel(this->p_model_proxy);
+  QTreeView::setModel(p_model);
+
   this->header()->setResizeMode(0,QHeaderView::ResizeToContents);
   this->header()->setStretchLastSection(false);
   if(p_model!=NULL && p_model->index(0,0).isValid()) {
     // Select first tree item
     this->setCurrentIndex(p_model->index(0,0));
   }
 }
-
-//int RegistryNodeTree::sizeHintForColumn(int column) const {}
-
+/*
+QModelIndex RegistryNodeTree::MapIndexToModel(const QModelIndex &index) {
+  if(this->p_model_proxy==NULL) return QModelIndex();
+  else return this->p_model_proxy->mapToSource(index);
+}
+*/
 void RegistryNodeTree::contextMenuEvent(QContextMenuEvent *p_event) {
   // Only show context menu when a node is selected
   if(this->selectedIndexes().count()!=1) return;
   // Only show context menu when user clicked on selected row
   if(this->indexAt(p_event->pos())!=this->selectedIndexes().at(0)) return;
 
   // Emit a click signal
   emit(this->clicked(this->indexAt(p_event->pos())));
 
   // Create context menu and add actions
   QMenu context_menu(this);
   context_menu.addMenu(this->p_menu_copy);
   context_menu.exec(p_event->globalPos());
 }
 
 void RegistryNodeTree::keyPressEvent(QKeyEvent *p_event) {
   // Only react if a node is selected and user pressed Key_Left
   if(this->selectedIndexes().count()==1 &&
      p_event->key()==Qt::Key_Left)
   {
     QModelIndex cur_index=this->selectedIndexes().at(0);
 
     if(this->model()->hasChildren(cur_index) && this->isExpanded(cur_index)) {
       // Current node is expanded. Only collapse this one
       this->collapse(cur_index);
       return;
     }
     if(!cur_index.parent().isValid()) {
       // Do no try to collapse anything above root node
       return;
     }
     this->collapse(cur_index.parent());
     this->setCurrentIndex(cur_index.parent());
     return;
   }
 
   // If we didn't handle the key event, let our parent handle it
   QTreeView::keyPressEvent(p_event);
 }
 
 void RegistryNodeTree::currentChanged(const QModelIndex &current,
                                       const QModelIndex &previous)
 {
   // Call parent class's currentChanged first
   QTreeView::currentChanged(current,previous);
 
   // Now emit our signal
   QModelIndex current_item=QModelIndex(current);
   emit(RegistryNodeTree::CurrentItemChanged(current_item));
 }
 
 void RegistryNodeTree::SlotCopyNodeName() {
   QApplication::clipboard()->
     setText(this->selectedIndexes().at(0).data().toString(),
             QClipboard::Clipboard);
 }
 
 void RegistryNodeTree::SlotCopyNodePath() {
   QString path=((RegistryNodeTreeModel*)(this->model()))->
     GetNodePath(this->selectedIndexes().at(0));
   QApplication::clipboard()->setText(path,QClipboard::Clipboard);
 }
diff --git a/trunk/registrynodetree.h b/trunk/registrynodetree.h
index 7e3c96d..cd85fb3 100644
--- a/trunk/registrynodetree.h
+++ b/trunk/registrynodetree.h
@@ -1,62 +1,63 @@
 /*******************************************************************************
 * fred Copyright (c) 2011-2013 by Gillen Daniel <gillen.dan@pinguin.lu>        *
 *                                                                              *
 * Forensic Registry EDitor (fred) is a cross-platform M$ registry hive editor  *
 * with special feautures useful during forensic analysis.                      *
 *                                                                              *
 * 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/>.                    *
 *******************************************************************************/
 
 #ifndef REGISTRYNODETREE_H
 #define REGISTRYNODETREE_H
 
 #include <QTreeView>
 #include <QAbstractItemModel>
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QAction>
 
 #include "registrynodetreemodelproxy.h"
 
 class RegistryNodeTree : public QTreeView {
   Q_OBJECT
 
   public:
     RegistryNodeTree(QWidget *p_parent=0);
     ~RegistryNodeTree();
 
     void setModel(QAbstractItemModel *p_model);
+    QModelIndex MapIndexToModel(const QModelIndex &index);
 
   Q_SIGNALS:
     void CurrentItemChanged(QModelIndex current);
 
   protected:
   //  int sizeHintForColumn(int column) const;
     void contextMenuEvent(QContextMenuEvent *p_event);
     void keyPressEvent(QKeyEvent *p_event);
 
   private:
     RegistryNodeTreeModelProxy *p_model_proxy;
     QMenu *p_menu_copy;
     QAction *p_action_copy_node_name;
     QAction *p_action_copy_node_path;
     void currentChanged(const QModelIndex &current,
                         const QModelIndex &previous);
 
   private slots:
     void SlotCopyNodeName();
     void SlotCopyNodePath();
 };
 
 #endif // REGISTRYNODETREE_H
diff --git a/trunk/registrynodetreemodelproxy.cpp b/trunk/registrynodetreemodelproxy.cpp
index 065ae3f..1aab83b 100644
--- a/trunk/registrynodetreemodelproxy.cpp
+++ b/trunk/registrynodetreemodelproxy.cpp
@@ -1,42 +1,40 @@
 /*******************************************************************************
 * fred Copyright (c) 2011-2013 by Gillen Daniel <gillen.dan@pinguin.lu>        *
 *                                                                              *
 * Forensic Registry EDitor (fred) is a cross-platform M$ registry hive editor  *
 * with special feautures useful during forensic analysis.                      *
 *                                                                              *
 * 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/>.                    *
 *******************************************************************************/
 
 #include "registrynodetreemodelproxy.h"
 
 RegistryNodeTreeModelProxy::RegistryNodeTreeModelProxy(QObject *p_parent) :
   QSortFilterProxyModel(p_parent)
 {
 }
 
 bool RegistryNodeTreeModelProxy::lessThan(const QModelIndex &left,
                                           const QModelIndex &right) const
 {
   QVariant leftData=this->sourceModel()->data(left);
   QVariant rightData=this->sourceModel()->data(right);
 
   if(leftData.type()==QVariant::String && rightData.type()==QVariant::String) {
     // Sort strings case insensitive
-//    return QString::localeAwareCompare(leftData.toString().toLower(),
-//                                       rightData.toString().toLower());
-    return QSortFilterProxyModel::lessThan(left,right);
+    return leftData.toString().toLower()<rightData.toString().toLower();
   } else {
     return QSortFilterProxyModel::lessThan(left,right);
   }
 }