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 17f7f09654..4d7283209d 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
@@ -171,7 +171,7 @@
 					</select></li>
 	<li><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 a27bd39919..9f8fc14ca9 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -208,6 +208,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
             $column = "old_issues.issuedate";
@@ -232,15 +238,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";
@@ -333,7 +339,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;