diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
index 2e4dd5b..3dc11d0 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
@@ -6,6 +6,8 @@ import eu.dnetlib.repo.manager.domain.OrderByType;
 import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
 import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -37,6 +39,13 @@ public class PiWikController {
     }
 
     @RequestMapping(value = "/getPiwikSitesForRepos" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "from", dataType = "number", paramType = "query"),
+            @ApiImplicitParam(name = "quantity", dataType = "number", paramType = "query"),
+            @ApiImplicitParam(name = "order", dataType = "eu.dnetlib.repo.manager.domain.OrderByType", paramType = "query"),
+            @ApiImplicitParam(name = "searchField", dataType = "eu.dnetlib.repo.manager.domain.OrderByField", paramType = "query"),
+            @ApiImplicitParam(name = "orderField", dataType = "string", paramType = "query"),
+    })
     public List<PiwikInfo> getPiwikSitesForRepos(
             @RequestParam(value = "from",required=false,defaultValue = "0") int from,
             @RequestParam(value = "quantity",required=false,defaultValue = "100") int quantity,
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
index 08f4673..91c2ff9 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
@@ -55,7 +55,7 @@ public class PiWikServiceImpl implements PiWikService {
 
     @Autowired
     @Qualifier("emailUtils")
-    EmailUtils emailUtils;
+    private EmailUtils emailUtils;
 
     private static final Logger LOGGER = Logger
             .getLogger(PiWikServiceImpl.class);
@@ -64,12 +64,10 @@ public class PiWikServiceImpl implements PiWikService {
 
     private final static String INSERT_PIWIK_INFO = "insert into piwik_site (repositoryid, siteid, creationdate, requestorname, requestoremail, validated, repositoryname, country, authenticationtoken) values (?, ?, now(), ?, ?, ?, ?, ?, ?)";
 
-    private final static String GET_PIWIK_SITES = "select repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site ";
+    private final static String GET_PIWIK_SITES = "select count(*) OVER() as totals, repositoryid, siteid, authenticationtoken, creationdate, requestorname, requestoremail, validated, validationdate, comment, repositoryname, country from piwik_site ";
 
     private final static String APPROVE_PIWIK_SITE = "update piwik_site set validated=true, validationdate=now() where repositoryid = ?;";
 
-
-
     private RowMapper<PiwikInfo> piwikRowMapper = (rs, i) -> new PiwikInfo(rs.getString("repositoryid"), getOpenaireId(rs.getString("repositoryid")), rs.getString("repositoryname"), rs.getString("country"),
             rs.getString("siteid"), rs.getString("authenticationtoken"), rs.getTimestamp("creationdate"), rs.getString("requestorname"), rs.getString("requestoremail"),
             rs.getBoolean("validated"), rs.getTimestamp("validationdate"), rs.getString("comment"));