diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 57019aac..6c777e73 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -36,7 +36,6 @@ const QString UBFeaturesController::webSearchPath = rootPath + "/Web search";
 
 void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet<QUrl> &pFavoriteSet)
 {
-    
     Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists());
 
     QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
@@ -73,16 +72,16 @@ void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString &
     }
 }
 
-void UBFeaturesComputingThread::scanAll(QList<QPair<QUrl, QString> > pScanningData, const QSet<QUrl> &pFavoriteSet)
+void UBFeaturesComputingThread::scanAll(QList<QPair<QUrl, UBFeature> > pScanningData, const QSet<QUrl> &pFavoriteSet)
 {
     for (int i = 0; i < pScanningData.count(); i++) {
         if (abort) {
             return;
         }
-        QPair<QUrl, QString> curPair = pScanningData.at(i);
+        QPair<QUrl, UBFeature> curPair = pScanningData.at(i);
 
-        emit scanCategory(UBFeaturesController::categoryNameForVirtualPath(curPair.second));
-        scanFS(curPair.first, curPair.second, pFavoriteSet);
+        emit scanCategory(curPair.second.getDisplayName());
+        scanFS(curPair.first, curPair.second.getFullVirtualPath(), pFavoriteSet);
     }
 }
 
@@ -109,11 +108,11 @@ int UBFeaturesComputingThread::featuresCount(const QUrl &pPath)
     return noItems;
 }
 
-int UBFeaturesComputingThread::featuresCountAll(QList<QPair<QUrl, QString> > pScanningData)
+int UBFeaturesComputingThread::featuresCountAll(QList<QPair<QUrl, UBFeature> > pScanningData)
 {
     int noItems = 0;
     for (int i = 0; i < pScanningData.count(); i++) {
-        QPair<QUrl, QString> curPair = pScanningData.at(i);
+        QPair<QUrl, UBFeature> curPair = pScanningData.at(i);
         noItems += featuresCount(curPair.first);
     }
 
@@ -127,7 +126,7 @@ QThread(parent)
     abort = false;
 }
 
-void UBFeaturesComputingThread::compute(const QList<QPair<QUrl, QString> > &pScanningData, QSet<QUrl> *pFavoritesSet)
+void UBFeaturesComputingThread::compute(const QList<QPair<QUrl, UBFeature> > &pScanningData, QSet<QUrl> *pFavoritesSet)
 {
     QMutexLocker curLocker(&mMutex);
 
@@ -148,7 +147,7 @@ void UBFeaturesComputingThread::run()
         qDebug() << "Custom thread started execution";
 
         mMutex.lock();
-        QList<QPair<QUrl, QString> > searchData = mScanningData;
+        QList<QPair<QUrl, UBFeature> > searchData = mScanningData;
         QSet<QUrl> favoriteSet = mFavoriteSet;
         mMutex.unlock();
 
@@ -339,24 +338,24 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) :
 
 void UBFeaturesController::startThread()
 {
-    QList<QPair<QUrl, QString> > computingData;
+    QList<QPair<QUrl, UBFeature> > computingData;
 
-    computingData << QPair<QUrl, QString>(mLibAudiosDirectoryPath, audiosPath)
-            <<  QPair<QUrl, QString>(mLibVideosDirectoryPath, moviesPath)
-            <<  QPair<QUrl, QString>(mLibAnimationsDirectoryPath, flashPath)
-            <<  QPair<QUrl, QString>(mLibPicturesDirectoryPath, picturesPath)
+    computingData << QPair<QUrl, UBFeature>(mLibAudiosDirectoryPath, audiosElement)
+            <<  QPair<QUrl, UBFeature>(mLibVideosDirectoryPath, moviesElement)
+            <<  QPair<QUrl, UBFeature>(mLibAnimationsDirectoryPath, flashElement)
+            <<  QPair<QUrl, UBFeature>(mLibPicturesDirectoryPath, picturesElement)
 
-            <<  QPair<QUrl, QString>(mUserInteractiveDirectoryPath, appPath)
-            <<  QPair<QUrl, QString>(mUserAudioDirectoryPath, audiosPath)
-            <<  QPair<QUrl, QString>(mUserPicturesDirectoryPath, picturesPath)
-            <<  QPair<QUrl, QString>(mUserVideoDirectoryPath, moviesPath)
-            <<  QPair<QUrl, QString>(mUserAnimationDirectoryPath, flashPath)
+            <<  QPair<QUrl, UBFeature>(mUserInteractiveDirectoryPath, applicationsElement)
+            <<  QPair<QUrl, UBFeature>(mUserAudioDirectoryPath, audiosElement)
+            <<  QPair<QUrl, UBFeature>(mUserPicturesDirectoryPath, picturesElement)
+            <<  QPair<QUrl, UBFeature>(mUserVideoDirectoryPath, moviesElement)
+            <<  QPair<QUrl, UBFeature>(mUserAnimationDirectoryPath, flashElement)
 
-            <<  QPair<QUrl, QString>(mLibApplicationsDirectoryPath, appPath)
-            <<  QPair<QUrl, QString>(mLibShapesDirectoryPath, shapesPath)
-            <<  QPair<QUrl, QString>(mLibInteractiveDirectoryPath, interactPath)
-            <<  QPair<QUrl, QString>(trashDirectoryPath, trashPath)
-            <<  QPair<QUrl, QString>(mLibSearchDirectoryPath, rootPath + "/" + "Web search");
+            <<  QPair<QUrl, UBFeature>(mLibApplicationsDirectoryPath, applicationsElement)
+            <<  QPair<QUrl, UBFeature>(mLibShapesDirectoryPath, shapesElement)
+            <<  QPair<QUrl, UBFeature>(mLibInteractiveDirectoryPath, interactElement)
+            <<  QPair<QUrl, UBFeature>(trashDirectoryPath, trashElement)
+            <<  QPair<QUrl, UBFeature>(mLibSearchDirectoryPath, webSearchElement);
 
     mCThread.compute(computingData, favoriteSet);
 }
diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index 92c31224..b48f3d62 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -33,7 +33,7 @@ class UBFeaturesComputingThread : public QThread
 public:
     explicit UBFeaturesComputingThread(QObject *parent = 0);
     virtual ~UBFeaturesComputingThread();
-        void compute(const QList<QPair<QUrl, QString> > &pScanningData, QSet<QUrl> *pFavoritesSet);
+        void compute(const QList<QPair<QUrl, UBFeature> > &pScanningData, QSet<QUrl> *pFavoritesSet);
 
 protected:
     void run();
@@ -51,16 +51,16 @@ public slots:
 
 private:
     void scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet<QUrl> &pFavoriteSet);
-    void scanAll(QList<QPair<QUrl, QString> > pScanningData, const QSet<QUrl> &pFavoriteSet);
+    void scanAll(QList<QPair<QUrl, UBFeature> > pScanningData, const QSet<QUrl> &pFavoriteSet);
     int featuresCount(const QUrl &pPath);
-    int featuresCountAll(QList<QPair<QUrl, QString> > pScanningData);
+    int featuresCountAll(QList<QPair<QUrl, UBFeature> > pScanningData);
 
 private:
     QMutex mMutex;
     QWaitCondition mWaitCondition;
     QUrl mScanningPath;
     QString mScanningVirtualPath;
-    QList<QPair<QUrl, QString> > mScanningData;
+    QList<QPair<QUrl, UBFeature> > mScanningData;
     QSet<QUrl> mFavoriteSet;
     bool restart;
     bool abort;
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index 78823404..ee052027 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -676,7 +676,7 @@ UBFeaturesProgressInfo::UBFeaturesProgressInfo(QWidget *parent) :
 
 void UBFeaturesProgressInfo::setCommmonInfoText(const QString &str)
 {
-    mProgressBar->setFormat(str + tr(" load") + "(%p%)");
+    mProgressBar->setFormat(tr("Loading ") + str + " (%p%)");
 }
 
 void UBFeaturesProgressInfo::setDetailedInfoText(const QString &str)