diff --git a/cmabroadcast.cpp b/cmabroadcast.cpp
index bf594b6..af153a8 100644
--- a/cmabroadcast.cpp
+++ b/cmabroadcast.cpp
@@ -37,8 +37,8 @@ const QString CmaBroadcast::broadcast_reply =
     "host-wireless-protocol-version:%7\r\n"
     "host-supported-device:PS Vita, PS Vita TV\r\n";
 
-const char *CmaBroadcast::broadcast_query_01 = "SRCH * HTTP/1.1\r\n";
-const char *CmaBroadcast::broadcast_query_02 = "SRCH3 * HTTP/1.1\r\n";
+const char *CmaBroadcast::broadcast_query_start = "SRCH";
+const char *CmaBroadcast::broadcast_query_end = " * HTTP/1.1\r\n";
 
 const char *CmaBroadcast::broadcast_ok = "HTTP/1.1 200 OK";
 const char *CmaBroadcast::broadcast_unavailable = "HTTP/1.1 503 NG";
@@ -73,7 +73,7 @@ void CmaBroadcast::readPendingDatagrams()
 
         socket->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
 
-        if(datagram.contains(broadcast_query_01) || datagram.contains(broadcast_query_02)) {
+        if(datagram.startsWith(broadcast_query_start) && datagram.contains(broadcast_query_end)) {
             QMutexLocker locker(&mutex);
             socket->writeDatagram(reply, sender, senderPort);
         } else {
diff --git a/cmabroadcast.h b/cmabroadcast.h
index 6fd2bf5..14cbaf1 100644
--- a/cmabroadcast.h
+++ b/cmabroadcast.h
@@ -42,8 +42,8 @@ private:
     QUdpSocket *socket;
 
     static const QString broadcast_reply;
-    static const char *broadcast_query_01;
-    static const char *broadcast_query_02;
+    static const char *broadcast_query_start;
+    static const char *broadcast_query_end;
     static const char *broadcast_ok;
     static const char *broadcast_unavailable;