diff --git a/descriptor.c b/descriptor.c
index a854f62..e82dd96 100644
--- a/descriptor.c
+++ b/descriptor.c
@@ -112,6 +112,11 @@ read_descriptor(struct epg *epg, struct descriptor *d)
 		break;
 
 	    default:
+		printf("Default descriptor: %d\n", d->tag);
+	    case DS_LINKAGE:
+	    case DS_CONTENT:	
+	    case DS_PRIVATE_DATA_SPECIFIER:
+	    case DS_FTA_CONTENT_MGMT:
 		d->content.unknown.text = string_to_end(epg, d, 0,
 		    &d->content.unknown.textlen);
 		break;
diff --git a/main.c b/main.c
index 28557db..d10df03 100644
--- a/main.c
+++ b/main.c
@@ -70,8 +70,10 @@ main(int argc, char **argv)
 				ds = read_descriptor_header(epg);
 				read_descriptor(epg, ds);
 
+/*
 				if (ds->tag == DS_CONTENT_IDENTIFIER)
 					dump_descriptor(ds, 1);
+*/
 
 				free_descriptor(ds);
 			}