diff --git a/src/ui/uas/UASQuickViewItemSelect.cc b/src/ui/uas/UASQuickViewItemSelect.cc
index bf3832333cffa5017396bbc548c60ceb93b565bb..6536529cae513debfa7dc251e0e1489eff3c9fe1 100644
--- a/src/ui/uas/UASQuickViewItemSelect.cc
+++ b/src/ui/uas/UASQuickViewItemSelect.cc
@@ -35,6 +35,7 @@ void UASQuickViewItemSelect::addItem(QString item,bool enabled)
         ui.gridLayout->addWidget(titlelabel,0,col);
     }
     QCheckBox *label = new QCheckBox(this);
+    m_checkboxToValueMap[label] = item;
     m_checkBoxList.append(label);
     if (enabled)
     {
@@ -82,13 +83,19 @@ void UASQuickViewItemSelect::checkBoxClicked(bool checked)
     {
         return;
     }
+    QString checkval = check->text();
+    if (m_checkboxToValueMap.contains(check))
+    {
+        checkval = m_checkboxToValueMap[check];
+    }
     if (checked)
     {
-        emit valueEnabled(check->text());
+
+        emit valueEnabled(checkval);
     }
     else
     {
-        emit valueDisabled(check->text());
+        emit valueDisabled(checkval);
     }
 }
 
diff --git a/src/ui/uas/UASQuickViewItemSelect.h b/src/ui/uas/UASQuickViewItemSelect.h
index 04174b4b7ef87313b352ff07b2eaa9aae70c7d7a..efd769cb3ae5930674bf4937110bcfbe44fdd3eb 100644
--- a/src/ui/uas/UASQuickViewItemSelect.h
+++ b/src/ui/uas/UASQuickViewItemSelect.h
@@ -19,6 +19,7 @@ protected:
     void resizeEvent(QResizeEvent *event);
 private:
     QMap<QString,int> m_categoryToIndexMap;
+    QMap<QCheckBox*,QString> m_checkboxToValueMap;
     QList<QCheckBox*> m_checkBoxList;
     Ui::UASQuickViewItemSelect ui;
 private slots:
diff --git a/src/ui/uas/UASQuickViewTextItem.cc b/src/ui/uas/UASQuickViewTextItem.cc
index c8fb12e861f8b2ba57290179ae081967aca5ca98..3fbdd932d2e3bd89bc160a1e8496fc4c388845cd 100644
--- a/src/ui/uas/UASQuickViewTextItem.cc
+++ b/src/ui/uas/UASQuickViewTextItem.cc
@@ -32,7 +32,14 @@ void UASQuickViewTextItem::setValue(double value)
 
 void UASQuickViewTextItem::setTitle(QString title)
 {
-    titleLabel->setText(title);
+    if (title.indexOf(".") != -1 && title.indexOf(":") != -1)
+    {
+        titleLabel->setText(title.mid(title.indexOf(".")+1));
+    }
+    else
+    {
+        titleLabel->setText(title);
+    }
 }
 void UASQuickViewTextItem::resizeEvent(QResizeEvent *event)
 {