diff --git a/apps/aqhome-tool/data/devicestate.c b/apps/aqhome-tool/data/devicestate.c
index c6f9dcb..2b7a9b8 100644
--- a/apps/aqhome-tool/data/devicestate.c
+++ b/apps/aqhome-tool/data/devicestate.c
@@ -54,7 +54,7 @@
 
 static int _runCommand(AQH_DATACLIENT *dc);
 static void _handleDevice(AQH_DATACLIENT *dc, const AQH_DEVICE *device);
-static void _handleValue(AQH_DATACLIENT *dc, const AQH_DEVICE *device, const AQH_VALUE *value);
+static void _handleValue(AQH_DATACLIENT *dc, const AQH_VALUE *value);
 static void _printDataPoints(const uint64_t *dataPoints, uint32_t numValues);
 static void _printSingleDataPoint(uint64_t timestamp, double data);
 
@@ -80,6 +80,7 @@ int AQH_Tool_DeviceState(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
     { A_ARG, A_CHAR, "userId",              0,  1,  "u",  "userid",      I18S("Specify user id"), NULL},
     { A_ARG, A_CHAR, "password",            0,  1,  "p",  "password",    I18S("Specify service password"), NULL},
     { A_ARG, A_CHAR, "device",              1,  1,  "d",  "device",      I18S("device name"), NULL},
+    { A_ARG, A_CHAR, "valueName",           0,  1,  "N",  "valuename",   I18S("Value name for device(e.g. LIGHT)"), NULL},
     { A_ARG, A_INT,  "numOfDatapoints",     0,  1,  "n",  NULL,          I18S("Get up to n datapoints"), NULL},
     { A_END, A_INT,  "help",                0,  0,  "h",  "help",        I18S("Show this help screen"), NULL}
   };
@@ -178,7 +179,7 @@ void _handleDevice(AQH_DATACLIENT *dc, const AQH_DEVICE *device)
     value=AQH_Value_List_First(valueList);
     while(value) {
       if (AQH_Value_GetValueType(value)==AQH_ValueType_Sensor)
-	_handleValue(dc, device, value);
+	_handleValue(dc, value);
       value=AQH_Value_List_Next(value);
     }
   }
@@ -188,17 +189,21 @@ void _handleDevice(AQH_DATACLIENT *dc, const AQH_DEVICE *device)
 
 
 
-void _handleValue(AQH_DATACLIENT *dc, const AQH_DEVICE *device, const AQH_VALUE *value)
+void _handleValue(AQH_DATACLIENT *dc, const AQH_VALUE *value)
 {
   GWEN_DB_NODE *dbLocalArgs;
+  const char *wantedValueName;
   const char *valueName;
   int numDataPoints;
 
   dbLocalArgs=AQH_DataClient_GetDbLocalArgs(dc);
   numDataPoints=GWEN_DB_GetIntValue(dbLocalArgs, "numOfDatapoints", 0, 5);
+  wantedValueName=GWEN_DB_GetCharValue(dbLocalArgs, "valueName", 0, "*");
 
   valueName=AQH_Value_GetName(value);
-  if (valueName && -1==GWEN_Text_ComparePattern(valueName, "stats_*", 0)) {
+  if (valueName &&
+      -1==GWEN_Text_ComparePattern(valueName, "stats_*", 0) &&
+      -1!=GWEN_Text_ComparePattern(valueName, wantedValueName, 0)) {
     const char *valueNameForSystem;
     uint64_t *dataPoints;
     uint64_t recvdNum;