diff --git a/src/core/cntlr_map_debug.c b/src/core/cntlr_map_debug.c
index 5566dbd7484a8d350a7f334bb630444a3cfc15b2..9603273026b34c149233a36c8d632219d7d62b61 100644
--- a/src/core/cntlr_map_debug.c
+++ b/src/core/cntlr_map_debug.c
@@ -190,20 +190,45 @@ int debug_channel_pref_report(void *cntlr, struct cmdu_cstruct *cmdu)
 				trace("\tch_preference_op_class_nr: %d\n",
 						p->ch_preference_op_class_nr);
 
-				for (j = 0; j < p->ch_preference_op_class_nr;
-					j++) {
+				for (j = 0; j < p->ch_preference_op_class_nr; j++) {
 					trace("\t\top_class: %d\n",
 						p->op_class[j].op_class);
-					trace("\t\tnon_op_ch_nr: %d\n",
+					trace("\t\top_channel_nr: %d\n",
 						p->op_class[j].channel_nr);
 
-			//for (k = 0; k < p->operating_class[j].channel_nr; k++)
-			//        trace("\t\t\tchannel: %d\n",
-			//            p->operating_class[j].channel_list[k]);
+					for (k = 0; k < p->op_class[j].channel_nr; k++) {
+						trace("\t\t\tchannel: %d\n",
+							p->op_class[j].channel_list[k]);
+					}
 					trace("\t\tpreference: %d\n",
 						p->op_class[j].preference);
 					trace("\t\tpreference_reason: %d\n",
-					p->op_class[j].preference_reason);
+						p->op_class[j].preference_reason);
+				}
+				break;
+			}
+		case MAP_TLV_RADIO_OPERATION_RESTRICTION:
+			{
+				struct tlv_radio_oper_restrict  *p =
+					(struct tlv_radio_oper_restrict *)tlv;
+
+				trace("\tradio_id: " MACFMT "\n",
+					MAC2STR(p->radio_id));
+				trace("\top_restricted_op_class_nr: %d\n",
+					p->op_restricted_op_class_nr);
+
+				for (j = 0; j < p->op_restricted_op_class_nr; j++) {
+					trace("\t\top_class: %d\n",
+						p->restricted_op_class[j].op_class);
+					trace("\t\top_channel_nr: %d\n",
+						p->restricted_op_class[j].channel_nr);
+
+					for (k = 0; k < p->restricted_op_class[j].channel_nr; k++) {
+						trace("\t\t\tchannel: %d\n",
+							p->restricted_op_class[j].restricted_channels[k].channel);
+						trace("\t\t\tmin_freq_sep: %d\n",
+							p->restricted_op_class[j].restricted_channels[k].min_freq_sep);
+					}
 				}
 				break;
 			}
diff --git a/src/core/cntlr_ubus.c b/src/core/cntlr_ubus.c
index 53e9dd9fa72e877d7875ed3c7ba67280103eb571..5659a95cd7bf36a0c6f631ce4fd2625720ab8837 100644
--- a/src/core/cntlr_ubus.c
+++ b/src/core/cntlr_ubus.c
@@ -343,7 +343,7 @@ static int cntlr_channel_pref(struct ubus_context *ctx, struct ubus_object *obj,
 	// TODO: ff:ff:ff:ff:ff:ff = send to all agents
 
 	cmdu_data->message_type = CMDU_CHANNEL_PREFERENCE_QUERY;
-	cmdu_data->message_id = 1;
+	cmdu_data->message_id = 2;
 
 	cmdu_data->num_tlvs = 0;