diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
index a0bc24909e..809fe3e7e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
@@ -178,7 +178,7 @@
                         ><label for="criteria">By: </label
                         ><select name="Criteria" id="criteria">
                             <option value="" selected="selected">None</option>
-                            <option value="branch">Library</option>
+                            <option value="branchcode">Library</option>
                             <option value="categorycode">Categorycode</option>
                             <option value="itemtype">Itemtype</option>
                             <option value="Day">Day</option>
diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index a53d4bb7be..16300a4efe 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -218,7 +218,6 @@ sub calculate {
         $colfilter[0] = @$filters[10] if ( $column =~ /issuedate/ );
         $colfilter[0] = @$filters[11] if ( $column =~ /issuedate/ );
 
-
         # loop cols.
         if ( $column eq "Day" ) {
 
@@ -226,6 +225,12 @@ sub calculate {
             $column = "old_issues.issuedate";
             $colfield .= "dayname($column)";
             $colorder .= "weekday($column)";
+        } elsif ( $column eq "Week" ) {
+
+            #Display by Week
+            $column = "old_issues.issuedate";
+            $colfield .= "week($column)";
+            $colorder .= "week($column)";
         } elsif ( $column eq "Month" ) {
 
             #Display by Month
@@ -252,15 +257,15 @@ sub calculate {
                      WHERE 1";
         if ( ( $column =~ /issuedate/ ) or ( $column =~ /returndate/ ) ) {
             if ( $colfilter[1] and ( $colfilter[0] ) ) {
-                $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' ";
+                $strsth2 .= " and $column between ? and ? ";
             } elsif ( $colfilter[1] ) {
-                $strsth2 .= " and $column < '$colfilter[1]' ";
+                $strsth2 .= " and $column < ? ";
             } elsif ( $colfilter[0] ) {
-                $strsth2 .= " and $column > '$colfilter[0]' ";
+                $strsth2 .= " and $column > ? ";
             }
         } elsif ( $colfilter[0] ) {
             $colfilter[0] =~ s/\*/%/g;
-            $strsth2 .= " and $column LIKE '$colfilter[0]' ";
+            $strsth2 .= " and $column LIKE ? ";
         }
         $strsth2 .= " group by $colfield";
         $strsth2 .= " order by $colorder";
@@ -354,7 +359,7 @@ sub calculate {
     $dbcalc->execute;
     my %indice;
     while ( my @data = $dbcalc->fetchrow ) {
-        my ( $row, $rank, $id, $callnum, $ccode, $loc, $col ) = @data;
+        my ( $row, $rank, $id, $col ) = @data;
         $col                                       = "zzEMPTY" if ( !defined($col) );
         $indice{$col}                              = 1         if ( not( $indice{$col} ) );
         $table[ $indice{$col} ]->{$col}->{'name'}  = $row;