diff --git a/src/distroquery.c b/src/distroquery.c
index 541edaa..04d943a 100644
--- a/src/distroquery.c
+++ b/src/distroquery.c
@@ -385,15 +385,16 @@ void printPackageData() {
            while (sqlite3_step(statement) == SQLITE_ROW) {
               numresults++;
               printf("<hr><br><div style='display:inline;color:white;background-color:green'> %s </div>&nbsp;"
-                        "<div style='display:inline;color:black;background-color:yellow'> %s </div><br>"
-                        "<b>%s</b> %s-%s<br>%s<br>Group: %s<br>Size: %s",
+                        "<div style='display:inline;color:black;background-color:yellow'> %s </div>&nbsp;"
+                        "<div style='display:inline;color:black;background-color:lightblue'>&nbsp%s&nbsp;</div><br>"
+                        "<b>%s</b> %s-%s<br>%s<br>Size: %s",
               query_arch,
-              query_repositories[i]->tag,
+              ct->tag,
+              sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "groupdescr")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "name")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "version")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "release")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "summary")),
-              sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "groupdescr")),
               humanSize(sqlite3_column_int(statement,sqlite3_find_column_id(statement, NULL, "size")), &strsize));
 
               printf("<br>Source package:");
@@ -485,15 +486,16 @@ void printSourcePackageData() {
            while (sqlite3_step(statement) == SQLITE_ROW) {
               numresults++;
               printf("<hr><br><div style='display:inline;color:white;background-color:red'> Source </div>&nbsp;"
-                        "<div style='display:inline;color:black;background-color:yellow'> %s </div><br>"
-                        "<b>%s</b> %s-%s<br>%s<br>Group: %s<br>Maintainer: %s<br>License: %s<br>URL: <a href=\"%s\" target=_new>%s</a><br>Size: %s"
+                        "<div style='display:inline;color:black;background-color:yellow'> %s </div>&nbsp;"
+                        "<div style='display:inline;color:black;background-color:lightblue'>&nbsp%s&nbsp;</div><br>"
+                        "<b>%s</b> %s-%s<br>%s<br>Maintainer: %s<br>License: %s<br>URL: <a href=\"%s\" target=_new>%s</a><br>Size: %s"
                         "<br><br><div style='text-align:justify;text-justify:inter-word;font-style:italic'>%s</div><br>",
-              query_repositories[i]->tag,
+              ct->tag,
+              sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "groupdescr")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "name")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "version")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "release")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "summary")),
-              sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "groupdescr")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packagers", "name")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "license")),
               sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "url")),