diff --git a/src/distroquery.c b/src/distroquery.c
index ae623d8..715b3c4 100644
--- a/src/distroquery.c
+++ b/src/distroquery.c
@@ -275,16 +275,17 @@ void printQueryData() {
 
                     /* download */
                        printf("<div style='display:inline;background-color:green'>"
-                           "<a href=\"%s%s/SRPMS.base/%s-%s-%s.src.rpm\" style=\"color:white\">&nbsp;Download&nbsp;</a></div>",                           
+                           "&nbsp;<a href=\"%s%s/SRPMS.base/%s-%s-%s.src.rpm\" style=\"color:white\">Download</a>&nbsp;</div>",
                        query_repositories[i]->download_prefix,
 		       query_repositories[i]->download_dir,
                        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")));
+
                     /* details */
                        printf("&nbsp;<div style='display:inline;background-color:lightblue;font-weight:strong'>"
-                          "<a href='javascript:distroquery_request("
-                          "\"repository=%s&package=%s&arch=%s\")' style=\"color:black\">&nbsp;Details&nbsp;</a></div>",
+                          "&nbsp;<a href='javascript:distroquery_request("
+                          "\"repository=%s&package=%s&arch=%s\")' style=\"color:black\">Details</a>&nbsp;</div>",
                        query_repositories[i]->tag,
                        sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "name")),
                        query_repositories[i]->arch[a]);
@@ -425,7 +426,18 @@ void printPackageData() {
               printf("<br><br><div style='text-align:justify;text-justify:inter-word;font-style:italic'>%s</div><br>",
                  htmlclean(sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "description")),buffer,PATH_MAX));
 
-              printf("<hr><b>Developers details:</b>");
+              /* download */
+              printf("<div style='display:inline;background-color:green'>"
+                     "&nbsp;<a href=\"%s%s/RPMS.%s/%s-%s-%s.%s.rpm\" style=\"color:white\">Download</a>&nbsp;</div>",
+                       ct->download_prefix,
+                       ct->download_dir,
+                       query_arch,
+                       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")),
+                       query_arch);
+
+              printf("<hr><br><b>Developers details:</b>");
 
               printf("<br>Source package:");
               printf(" <a href='javascript:distroquery_request(\"repository=%s&package=%s\")'>%s</a>",
@@ -547,7 +559,16 @@ void printSourcePackageData() {
               printf("<br><br><div style='text-align:justify;text-justify:inter-word;font-style:italic'>%s</div><br>",
                  htmlclean(sqlite3_column_text(statement,sqlite3_find_column_id(statement, NULL, "description")),buffer,PATH_MAX));
 
-              printf("<hr><b>Developers details:</b>");
+              /* download */
+              printf("<div style='display:inline;background-color:green'>"
+                     "&nbsp;<a href=\"%s%s/SRPMS.base/%s-%s-%s.src.rpm\" style=\"color:white\">Download</a>&nbsp;</div>",
+                       ct->download_prefix,
+                       ct->download_dir,
+                       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")));
+
+              printf("<hr><br><b>Developers details:</b>");
               printf("<br>Maintainer: %s", sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packagers", "name")));
               printf("<br>Build date: %s",
                  simpleTimeToHuman(sqlite3_column_int(statement,sqlite3_find_column_id(statement, NULL, "buildtime")), (humanDate *) & strdate));
diff --git a/src/functions.c b/src/functions.c
index 37c4a93..156aff2 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -518,7 +518,7 @@ char *humanSize(long long sbytes, sizeString *s) {
 }
 
 
-char *htmlclean(char *source,char *dest,unsigned int max)
+const char *htmlclean(const char *source,char *dest,unsigned int max)
 {
    unsigned int i=0,j=0;
    char subst[10];
@@ -537,14 +537,14 @@ char *htmlclean(char *source,char *dest,unsigned int max)
 	 j+=strlen(subst);
       } else {
          fprintf(stderr,"Warning: can't tidy HTML string due to limited buffer.\n");
-	 return source;
+         return source;
       } 
       i++;
    }
    return dest;
 }
 
-char *htmlcleanNoBr(char *source,char *dest,unsigned int max)
+const char *htmlcleanNoBr(const char *source,char *dest,unsigned int max)
 {
    unsigned int i=0,j=0;
    char subst[10];
diff --git a/src/include/functions.h b/src/include/functions.h
index 646a70e..096562d 100644
--- a/src/include/functions.h
+++ b/src/include/functions.h
@@ -33,8 +33,8 @@ simpleTimeToTemplate(long calendartime, const char* template, humanDate * strdat
 humanDate *simpleTimeToHuman(long calendartime, humanDate * strdate);
 char *humanSize(long long sbytes, sizeString *s);
 void fprintf_depstable_filtered_var(FILE* f,char* st);
-char *htmlclean(char *source,char *dest,unsigned int max);
-char *htmlcleanNoBr(char *source,char *dest,unsigned int max);
+const char *htmlclean(const char *source,char *dest,unsigned int max);
+const char *htmlcleanNoBr(const char *source,char *dest,unsigned int max);
 int scansdir(const char *dir, struct dirent ***namelist,
             int (*select)(const struct dirent *),
             int (*compar)(const struct dirent **, const struct dirent **));