diff --git a/set-web/src/main/java/eu/europeana/set/web/service/controller/BaseRest.java b/set-web/src/main/java/eu/europeana/set/web/service/controller/BaseRest.java
index 7165b4c0..fae6080c 100644
--- a/set-web/src/main/java/eu/europeana/set/web/service/controller/BaseRest.java
+++ b/set-web/src/main/java/eu/europeana/set/web/service/controller/BaseRest.java
@@ -36,7 +36,6 @@
 import eu.europeana.api.commons.web.exception.ApplicationAuthenticationException;
 import eu.europeana.api.commons.web.exception.HttpException;
 import eu.europeana.api.commons.web.exception.ParamValidationException;
-import eu.europeana.api.commons.web.http.HttpHeaders;
 import eu.europeana.api.commons.web.model.vocabulary.Operations;
 import eu.europeana.set.definitions.config.UserSetConfiguration;
 import eu.europeana.set.definitions.exception.UserSetProfileValidationException;
diff --git a/set-web/src/main/java/eu/europeana/set/web/service/impl/BaseUserSetServiceImpl.java b/set-web/src/main/java/eu/europeana/set/web/service/impl/BaseUserSetServiceImpl.java
index c9748c12..57df49f6 100644
--- a/set-web/src/main/java/eu/europeana/set/web/service/impl/BaseUserSetServiceImpl.java
+++ b/set-web/src/main/java/eu/europeana/set/web/service/impl/BaseUserSetServiceImpl.java
@@ -16,9 +16,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
+import eu.europeana.api.commons.definitions.config.i18n.I18nConstants;
+import eu.europeana.api.commons.definitions.search.result.ResultsPage;
 import eu.europeana.api.commons.definitions.vocabulary.CommonApiConstants;
 import eu.europeana.api.commons.oauth2.model.ApiCredentials;
 import eu.europeana.api.commons.web.exception.ApplicationAuthenticationException;
+import eu.europeana.api.commons.web.exception.HttpException;
 import eu.europeana.api.commons.web.exception.ParamValidationException;
 import eu.europeana.set.definitions.config.UserSetConfiguration;
 import eu.europeana.set.definitions.model.UserSet;
@@ -79,9 +82,7 @@ protected UserSet writeUserSetToDb(UserSet existingUserSet) {
     // Respond with HTTP 200
     // update an existing user set. merge user sets - insert new fields in existing
     // object
-    UserSet updatedUserSet = getMongoPersistence().update((PersistentUserSet) existingUserSet);
-    //getUserSetUtils().updatePagination(updatedUserSet, getConfiguration());
-    return updatedUserSet;
+    return getMongoPersistence().update((PersistentUserSet) existingUserSet);
   }
 
 
@@ -523,8 +524,11 @@ private void validateAndSetItems(UserSet storedUserSet, UserSet userSetUpdates)
     }
   }
 
-  //this method is to be deprecated when the new items insert is used
-  @Deprecated
+  /**
+   * Validate conformity of item URLs
+   * @param items
+   * @throws ItemValidationException
+   */
   protected void validateItems(List<String> items) throws ItemValidationException {
     if(items==null || items.isEmpty()) {
       return;
@@ -538,7 +542,7 @@ protected void validateItems(List<String> items) throws ItemValidationException
         invalidItems.add(item);
       }
     }
-    if(invalidItems.size()>0) {
+    if(!invalidItems.isEmpty()) {
       throw new ItemValidationException(UserSetI18nConstants.USERSET_ITEM_INVALID_FORMAT, new String[] {invalidItems.toString()} );
     }
   }
@@ -551,43 +555,44 @@ protected void validateItemsStrings(List<String> items) throws ItemValidationExc
     List<String> invalidItems = new ArrayList<>();
     for(String item : items) {
       try {
-        if(item.startsWith(getConfiguration().getItemDataEndpoint())) {
-          String itemWithoutBase = item.replace(getConfiguration().getItemDataEndpoint(), "");
-          if(!itemWithoutBase.startsWith("/")) {
-            itemWithoutBase = "/" + itemWithoutBase;
-          }
-          validateItemPartial(itemWithoutBase);
-        }
-        else {
-          validateItemPartial(item);
-        }
-      }
-      catch (ItemValidationException ex) {
+        validateItem(item);
+      } catch (ItemValidationException ex) {
+        logger.trace("Invalid item: {}", item);
         invalidItems.add(item);
       }
     }
-    if(invalidItems.size()>0) {
+    if(!invalidItems.isEmpty()) {
       throw new ItemValidationException(UserSetI18nConstants.USERSET_ITEM_INVALID_FORMAT, new String[] {invalidItems.toString()} );
     }
   }
 
+  private void validateItem(String item) throws ItemValidationException {
+    String recordId = (item.startsWith(getConfiguration().getItemDataEndpoint())) ? extractRecordId(item) : item;
+    validateEuropeanaRecordId(recordId);
+  }
+
+  private String extractRecordId(String item) {
+    //remove base item url
+    String itemWithoutBase = item.substring(0, getConfiguration().getItemDataEndpoint().length());
+    if('/' != itemWithoutBase.charAt(0)) {
+      itemWithoutBase = '/' + itemWithoutBase;
+    }
+    return itemWithoutBase;
+  }
+
   protected void validateItemWhole(String item) throws ItemValidationException {
     if(!item.startsWith(getConfiguration().getItemDataEndpoint())) {
       throw new ItemValidationException(UserSetI18nConstants.USERSET_ITEM_INVALID_FORMAT, new String[] {item});
     }
     else {
-      String itemWithoutBase = item.replace(getConfiguration().getItemDataEndpoint(), "");
-      if(!itemWithoutBase.startsWith("/")) {
-        itemWithoutBase = "/" + itemWithoutBase;
-      }
-      validateItemPartial(itemWithoutBase);
+      validateEuropeanaRecordId(extractRecordId(item));
     }
   }
   
   /*
    * item validation is also implemented in the recommendation-api and can be moved to api-commons
    */
-  protected void validateItemPartial(String item) throws ItemValidationException {
+  protected void validateEuropeanaRecordId(String item) throws ItemValidationException {
      if(! UserSetUtils.EUROPEANA_ID.matcher(item).matches()) {
        throw new ItemValidationException(UserSetI18nConstants.USERSET_ITEM_INVALID_FORMAT, new String[] {item});
      }
@@ -986,4 +991,127 @@ public WebResource generateDepiction(UserSet userSet) throws SearchApiClientExce
     // TODO Auto-generated method stub
     return null;
   }
+
+  protected int calculatePosition(int position, List<String> items) {
+    int positionFinal = items.size();
+    if (position >= 0 && position < items.size()) {
+      positionFinal = position;
+    }
+    return positionFinal;
+  }
+
+  protected void addPagination(ResultsPage<?> resPage, String collectionUrl, int page, int pageSize, int lastPage,
+      LdProfiles profile) {
+        String currentPageUrl = buildPageUrl(collectionUrl, page, pageSize, profile);
+        resPage.setCurrentPageUri(currentPageUrl);
+      
+        if (page > UserSetUtils.DEFAULT_PAGE) {
+          String prevPage = buildPageUrl(collectionUrl, page - 1, pageSize, profile);
+          resPage.setPrevPageUri(prevPage);
+        }
+      
+        // if current page is not the last one
+        if (!isLastPage(page, lastPage)) {
+          String nextPage = buildPageUrl(collectionUrl, page + 1, pageSize, profile);
+          resPage.setNextPageUri(nextPage);
+        }
+      }
+
+  protected String buildSetIdUrl(final String identifier) {
+    return getConfiguration().getSetDataEndpoint() + identifier;
+  }
+
+  protected int validateLastPage(long totalInCollection, int pageSize, int pageNr)
+      throws ParamValidationException {
+        int lastPage = getLastPage(totalInCollection, pageSize);
+        if (pageNr > lastPage) {
+          throw new ParamValidationException(UserSetI18nConstants.USERSET_VALIDATION_PROPERTY_VALUE,
+              UserSetI18nConstants.USERSET_VALIDATION_PROPERTY_VALUE,
+              new String[] {CommonApiConstants.QUERY_PARAM_PAGE,
+                  "value out of range: " + pageNr + ", last page:" + lastPage});
+        }
+        return lastPage;
+      }
+
+  /**
+   * This method validates if the user is the owner/creator of the userset or the admin
+   * 
+   * @param userSet
+   * @param authentication
+   * @return
+   * @return userSet object
+   * @throws HttpException
+   */
+  @Override
+  public UserSet verifyOwnerOrAdmin(UserSet userSet, Authentication authentication, boolean includeEntitySetMsg) throws HttpException {
+  
+    return verifyOwnerOrAdminOrRole(userSet, authentication, null, includeEntitySetMsg);
+  }
+
+  /**
+   * This method validates if the user is the owner/creator of the userset or the admin
+   * 
+   * @param userSet the user set to verify access
+   * @param authentication the authentication token
+   * @param role optional role granting access
+   * @return the userset if the access is granted
+   * @throws HttpException if hte access is not granted
+   */
+  protected UserSet verifyOwnerOrAdminOrRole(UserSet userSet, Authentication authentication, String role, boolean includeEntitySetMsg)
+      throws HttpException {
+      
+        if (authentication == null) {
+          // access by API KEY, authentication not available
+          throw new ApplicationAuthenticationException(UserSetI18nConstants.USER_NOT_AUTHORIZED,
+              UserSetI18nConstants.USER_NOT_AUTHORIZED,
+              new String[] {
+                  "Access to update operations of private User Sets require user authentication with JwtToken"},
+              HttpStatus.FORBIDDEN);
+        }
+      
+        // verify ownership
+        if (isOwner(userSet, authentication) || hasAdminRights(authentication)) {
+          // approve owner or admin
+          return userSet;
+        }
+        if (role != null && hasRole(authentication, role)) {
+          // approve usr with role if provided
+          return userSet;
+        } else {
+          // not authorized
+          StringBuilder message = new StringBuilder();
+          if (includeEntitySetMsg) {
+            message.append(
+                "Only the contributors, creator of the entity user set or admins are authorized to perform this operation.");
+          } else {
+            message.append(
+                "Only the creators of the user set or admins are authorized to perform this operation.");
+          }
+          throw new ApplicationAuthenticationException(I18nConstants.OPERATION_NOT_AUTHORIZED,
+              I18nConstants.OPERATION_NOT_AUTHORIZED, new String[] {message.toString()},
+              HttpStatus.FORBIDDEN);
+        }
+      }
+
+  /**
+   * This method checks the permission to create or Update the entity user sets for entity sets
+   * creation or updating the items: 1) 'contributors' (users with editor role) 2) owner or admin ;
+   * all three are allowed to create/update the entity set
+   *
+   * @param existingUserSet
+   * @param authentication
+   * @throws HttpException
+   */
+  public void verifyPermissionToUpdate(UserSet existingUserSet, Authentication authentication, boolean includeEntitySetMsg)
+      throws HttpException {
+        if (existingUserSet.isEntityBestItemsSet() && hasEditorRole(authentication)) {
+          return;
+        }
+        // verifyOwnerOrAdmin(existingUserSet, authentication, includeEntitySetMsg);
+        if (existingUserSet.isPublished()) {
+          verifyOwnerOrAdminOrRole(existingUserSet, authentication, Roles.PUBLISHER.getName(), false);
+        } else {
+          verifyOwnerOrAdmin(existingUserSet, authentication, false);
+        }
+      }
 }
diff --git a/set-web/src/main/java/eu/europeana/set/web/service/impl/UserSetServiceImpl.java b/set-web/src/main/java/eu/europeana/set/web/service/impl/UserSetServiceImpl.java
index 13ebcf88..867e7f2d 100644
--- a/set-web/src/main/java/eu/europeana/set/web/service/impl/UserSetServiceImpl.java
+++ b/set-web/src/main/java/eu/europeana/set/web/service/impl/UserSetServiceImpl.java
@@ -10,17 +10,13 @@
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.europeana.api.commons.definitions.config.i18n.I18nConstants;
 import eu.europeana.api.commons.definitions.search.ResultSet;
-import eu.europeana.api.commons.definitions.search.result.ResultsPage;
-import eu.europeana.api.commons.definitions.vocabulary.CommonApiConstants;
 import eu.europeana.api.commons.definitions.vocabulary.CommonLdConstants;
 import eu.europeana.api.commons.web.exception.ApplicationAuthenticationException;
 import eu.europeana.api.commons.web.exception.HttpException;
@@ -56,7 +52,6 @@
 import eu.europeana.set.web.model.search.SearchApiUtils;
 import eu.europeana.set.web.model.search.UserSetIdsResultPage;
 import eu.europeana.set.web.model.search.UserSetResultPage;
-import eu.europeana.set.web.model.vocabulary.Roles;
 import ioinformarics.oss.jackson.module.jsonld.JsonldModule;
 
 public class UserSetServiceImpl extends BaseUserSetServiceImpl {
@@ -229,14 +224,6 @@ int validatePosition(String position, List<String> items, int pinnedItems) {
     return positionInt;
   }
   
-  int calculatePosition(int position, List<String> items) {
-    int positionFinal = items.size();
-    if (position >= 0 && position < items.size()) {
-      positionFinal = position;
-    }
-    return positionFinal;
-  }
-  
   public UserSet deleteItem(String item, UserSet existingUserSet) {
     // check if it is a pinned item, decrease the counter by 1 for entity sets
     if (existingUserSet.isEntityBestItemsSet()) {
@@ -269,8 +256,7 @@ public UserSet deleteMultipleItems(List<String> items, UserSet existingUserSet)
           existingUserSet.getItems().remove(item);
         }
       }
-    }
-    else {
+    } else {
       itemsRemoved=existingUserSet.getItems().removeAll(items);
     }
 
@@ -326,8 +312,7 @@ private UserSet updateItemsFromPinned(UserSet existingUserSet, List<String> item
     
     usersetItems.addAll(0, items);
     existingUserSet.setPinned(existingUserSet.getPinned() + items.size());
-    UserSet updatedSet=writeUserSetToDb(existingUserSet);
-    return updatedSet;
+    return writeUserSetToDb(existingUserSet);
   }
   
   private UserSet updateItemsFromUnpinned(UserSet existingUserSet, List<String> items, int position) throws ItemValidationException {
@@ -335,8 +320,7 @@ private UserSet updateItemsFromUnpinned(UserSet existingUserSet, List<String> it
     List<String> newItemsCopy=new ArrayList<>(items);
     if(usersetItems==null) {
       usersetItems=new ArrayList<>();
-    }
-    else {
+    } else {
       /*remove from the new items the ones that were pinned before
        *and from the user set the ones that are duplicates
       */
@@ -345,8 +329,7 @@ private UserSet updateItemsFromUnpinned(UserSet existingUserSet, List<String> it
         if(itemindex>=0) {
           if(itemindex < existingUserSet.getPinned()) {
             items.remove(newItem);
-          }
-          else {
+          } else {
             usersetItems.remove(newItem);
           }
         }
@@ -360,8 +343,7 @@ private UserSet updateItemsFromUnpinned(UserSet existingUserSet, List<String> it
     
     int positionFinal=calculatePosition(position, usersetItems);
     usersetItems.addAll(positionFinal, items);
-    UserSet updatedSet=writeUserSetToDb(existingUserSet);
-    return updatedSet;
+    return writeUserSetToDb(existingUserSet);
   }
 
   /*
@@ -373,7 +355,7 @@ private UserSet updateItemsFromUnpinned(UserSet existingUserSet, List<String> it
   public UserSet insertItem(String datasetId, String localId, String position,
       UserSet existingUserSet) throws ApplicationAuthenticationException, ItemValidationException {
     String itemForPartialValidation = "/" + datasetId + "/" + localId;
-    validateItemPartial(itemForPartialValidation);
+    validateEuropeanaRecordId(itemForPartialValidation);
 
     String newItem =
         UserSetUtils.buildItemUrl(getConfiguration().getItemDataEndpoint(), datasetId, localId);
@@ -609,18 +591,6 @@ private List<String> reorderItemDescriptions(UserSet userSet, List<String> itemD
     return orderedItemDescriptions;
   }
 
-  private int validateLastPage(long totalInCollection, int pageSize, int pageNr)
-      throws ParamValidationException {
-    int lastPage = getLastPage(totalInCollection, pageSize);
-    if (pageNr > lastPage) {
-      throw new ParamValidationException(UserSetI18nConstants.USERSET_VALIDATION_PROPERTY_VALUE,
-          UserSetI18nConstants.USERSET_VALIDATION_PROPERTY_VALUE,
-          new String[] {CommonApiConstants.QUERY_PARAM_PAGE,
-              "value out of range: " + pageNr + ", last page:" + lastPage});
-    }
-    return lastPage;
-  }
-
   @Override
   public ResultSet<? extends UserSet> search(UserSetQuery searchQuery, UserSetFacetQuery facetQuery,
       List<LdProfiles> profiles, Authentication authentication) {
@@ -729,23 +699,6 @@ void setPageItems(ResultSet<? extends UserSet> results, UserSetResultPage resPag
     resPage.setTotalInPage(items.size());
   }
 
-  private void addPagination(ResultsPage<?> resPage, String collectionUrl, int page,
-      int pageSize, int lastPage, LdProfiles profile) {
-    String currentPageUrl = buildPageUrl(collectionUrl, page, pageSize, profile);
-    resPage.setCurrentPageUri(currentPageUrl);
-
-    if (page > UserSetUtils.DEFAULT_PAGE) {
-      String prevPage = buildPageUrl(collectionUrl, page - 1, pageSize, profile);
-      resPage.setPrevPageUri(prevPage);
-    }
-
-    // if current page is not the last one
-    if (!isLastPage(page, lastPage)) {
-      String nextPage = buildPageUrl(collectionUrl, page + 1, pageSize, profile);
-      resPage.setNextPageUri(nextPage);
-    }
-  }
-
   @Override
   public CollectionPage buildCollectionPage(UserSet userSet, LdProfiles profile, int pageNr,
       int pageSize, HttpServletRequest request) throws ParamValidationException {
@@ -803,10 +756,6 @@ public CollectionPage buildCollectionPage(UserSet userSet, LdProfiles profile, i
     return page;
   }
 
-  private String buildSetIdUrl(final String identifier) {
-    return getConfiguration().getSetDataEndpoint() + identifier;
-  }
-
   public ItemIdsResultPage buildItemIdsResultsPage(String setIdentifier, List<String> itemIds,
       int page, int pageSize, HttpServletRequest request) {
     // new ResultsPageImpl<T>()
@@ -870,90 +819,6 @@ public boolean hasEditorRole(Authentication authentication) {
     return hasEditorRights(authentication);
   }
 
-  /**
-   * This method validates if the user is the owner/creator of the userset or the admin
-   * 
-   * @param userSet
-   * @param authentication
-   * @return
-   * @return userSet object
-   * @throws HttpException
-   */
-  @Override
-  public UserSet verifyOwnerOrAdmin(UserSet userSet, Authentication authentication,
-      boolean includeEntitySetMsg) throws HttpException {
-
-    return verifyOwnerOrAdminOrRole(userSet, authentication, null, includeEntitySetMsg);
-  }
-
-  /**
-   * This method validates if the user is the owner/creator of the userset or the admin
-   * 
-   * @param userSet the user set to verify access
-   * @param authentication the authentication token
-   * @param role optional role granting access
-   * @return the userset if the access is granted
-   * @throws HttpException if hte access is not granted
-   */
-  UserSet verifyOwnerOrAdminOrRole(UserSet userSet, Authentication authentication, String role,
-      boolean includeEntitySetMsg) throws HttpException {
-
-    if (authentication == null) {
-      // access by API KEY, authentication not available
-      throw new ApplicationAuthenticationException(UserSetI18nConstants.USER_NOT_AUTHORIZED,
-          UserSetI18nConstants.USER_NOT_AUTHORIZED,
-          new String[] {
-              "Access to update operations of private User Sets require user authentication with JwtToken"},
-          HttpStatus.FORBIDDEN);
-    }
-
-    // verify ownership
-    if (isOwner(userSet, authentication) || hasAdminRights(authentication)) {
-      // approve owner or admin
-      return userSet;
-    }
-    if (role != null && hasRole(authentication, role)) {
-      // approve usr with role if provided
-      return userSet;
-    } else {
-      // not authorized
-      StringBuilder message = new StringBuilder();
-      if (includeEntitySetMsg) {
-        message.append(
-            "Only the contributors, creator of the entity user set or admins are authorized to perform this operation.");
-      } else {
-        message.append(
-            "Only the creators of the user set or admins are authorized to perform this operation.");
-      }
-      throw new ApplicationAuthenticationException(I18nConstants.OPERATION_NOT_AUTHORIZED,
-          I18nConstants.OPERATION_NOT_AUTHORIZED, new String[] {message.toString()},
-          HttpStatus.FORBIDDEN);
-    }
-  }
-
-  /**
-   * This method checks the permission to create or Update the entity user sets for entity sets
-   * creation or updating the items: 1) 'contributors' (users with editor role) 2) owner or admin ;
-   * all three are allowed to create/update the entity set
-   *
-   * @param existingUserSet
-   * @param authentication
-   * @throws HttpException
-   */
-  public void verifyPermissionToUpdate(UserSet existingUserSet, Authentication authentication,
-      boolean includeEntitySetMsg) throws HttpException {
-    if (existingUserSet.isEntityBestItemsSet() && hasEditorRole(authentication)) {
-      return;
-    }
-    // verifyOwnerOrAdmin(existingUserSet, authentication, includeEntitySetMsg);
-    if (existingUserSet.isPublished()) {
-      verifyOwnerOrAdminOrRole(existingUserSet, authentication, Roles.PUBLISHER.getName(), false);
-    } else {
-      verifyOwnerOrAdmin(existingUserSet, authentication, false);
-    }
-  }
- 
-
   /**
    * This methods applies Linked Data profile to a user set
    *