diff --git a/src/master/m-comms.c b/src/master/m-comms.c
index be88900..b7780b1 100644
--- a/src/master/m-comms.c
+++ b/src/master/m-comms.c
@@ -1047,15 +1047,21 @@ clean_spa:
 				memcpy(pss->specific, "refs/heads/", 11);
 				pss->specificity = SAIM_SPECIFIC_H;
 			} else
-				if (lws_get_urlarg_by_name(wsi, "id", pss->specific + 8,
-							   sizeof(pss->specific))) {
-					memcpy(pss->specific, "refs/heads/", 11);
+				if (lws_get_urlarg_by_name(wsi, "id",
+							   (char *)buf,
+							   sizeof(buf))) {
+					lws_strncpy(pss->specific,
+							(const char *)buf + 3,
+							sizeof(pss->specific));
 					pss->specificity = SAIM_SPECIFIC_ID;
 				} else {
 					pss->specificity = SAIM_SPECIFIC_H;
-					strncpy(pss->specific, "refs/heads/master",
+					lws_strncpy(pss->specific,
+							"refs/heads/master",
 							sizeof(pss->specific));
 				}
+			lwsl_info("%s: spec %d, '%s'\n", __func__,
+					pss->specificity, pss->specific);
 			break;
 		}
 
diff --git a/src/master/m-ws-browser.c b/src/master/m-ws-browser.c
index 8883e27..dab9256 100644
--- a/src/master/m-ws-browser.c
+++ b/src/master/m-ws-browser.c
@@ -779,7 +779,8 @@ again:
 			e = lws_container_of(pss->walk, sai_event_t, list);
 
 			if (pss->specificity) {
-				//lwsl_notice("%s %s %s\n", e->hash, e->ref, pss->specific);
+				lwsl_info("%s: specificity: e->hash: %s, e->ref: %s, pss->specific: %s\n",
+					    __func__, e->hash, e->ref, pss->specific);
 				if (strcmp(e->hash, pss->specific) &&
 				    strcmp(e->ref, pss->specific)) {
 					pss->walk = pss->walk->next;