--- a/filemanager/src/filemanager/src/components/fmcombinedquery.cpp	Mon May 03 12:24:39 2010 +0300
+++ b/filemanager/src/filemanager/src/components/fmcombinedquery.cpp	Tue Aug 24 10:24:14 2010 +0800
@@ -25,10 +25,12 @@
 #include <hblistwidgetitem.h>
 #include <hbabstractviewitem.h>
 
-FmCombinedQuery::FmCombinedQuery( QGraphicsItem *parent ) : HbDialog( parent ), 
+FmCombinedQuery::FmCombinedQuery( QGraphicsItem *parent ) : FmDialog( parent ), 
     mSelectMode ( MultiSelectMode ), mDominantIndex ( -1 )
 {
+    setObjectName( "combinedQueryDialog" );
 	mContentWidget = new QGraphicsWidget();
+	mContentWidget->setObjectName( "CombinedQueryContentWidget" );
 	setContentWidget(mContentWidget);
 
 	QGraphicsLinearLayout *vLayout = new QGraphicsLinearLayout();
@@ -38,7 +40,7 @@
 	vLayout->addItem( mListWidget );
 
     mListWidget->setFontSpec( HbFontSpec( HbFontSpec::Primary ) );
-
+    mListWidget->setObjectName( "CombinedQueryListWidget" );
 	this->setTimeout( NoTimeout );
 	mContentWidget->setLayout( vLayout );
 
@@ -110,7 +112,7 @@
 
 void FmCombinedQuery::activated( const QModelIndex &index )
 {
-	int selectedRow = mListWidget->indexPosition( index );
+	int selectedRow = index.row();
 	if( selectedRow == mDominantIndex ){
 		QModelIndexList modelIndexList = mListWidget->selectionModel()->selectedIndexes();
 		for( QModelIndexList::const_iterator it = modelIndexList.begin(); it != modelIndexList.end(); ++it ){