diff --git a/pom.xml b/pom.xml
index 85d0141d..7c789d64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>lutece-global-pom</artifactId>
         <groupId>fr.paris.lutece.tools</groupId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -52,7 +52,7 @@
             <!-- Needed by daisydiff -->
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.0</version>
         </dependency>
     </dependencies>
 
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/Blog.java b/src/java/fr/paris/lutece/plugins/blog/business/Blog.java
index 18b76f76..1e25649d 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/Blog.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/Blog.java
@@ -110,7 +110,7 @@ public class Blog extends ReferenceItem implements Serializable, IExtendableReso
     private List<Tag> _tag = new ArrayList<>( );
 
     private List<BlogPublication> _blogPubilcation = new ArrayList<>( );
-    
+
     /**
      * Returns the Id
      * 
@@ -187,7 +187,7 @@ public void setContentLabel( String strContentLabel )
      */
     public Timestamp getCreationDate( )
     {
-        return _dateCreationDate;
+        return (Timestamp) _dateCreationDate.clone( );
     }
 
     /**
@@ -198,7 +198,7 @@ public Timestamp getCreationDate( )
      */
     public void setCreationDate( Timestamp dateCreationDate )
     {
-        _dateCreationDate = dateCreationDate;
+        _dateCreationDate = (Timestamp) dateCreationDate.clone( );
     }
 
     /**
@@ -208,7 +208,7 @@ public void setCreationDate( Timestamp dateCreationDate )
      */
     public Timestamp getUpdateDate( )
     {
-        return _dateUpdateDate;
+        return (Timestamp) _dateUpdateDate.clone( );
     }
 
     /**
@@ -219,7 +219,7 @@ public Timestamp getUpdateDate( )
      */
     public void setUpdateDate( Timestamp dateUpdateDate )
     {
-        _dateUpdateDate = dateUpdateDate;
+        _dateUpdateDate = (Timestamp) dateUpdateDate.clone( );
     }
 
     /**
@@ -344,7 +344,7 @@ public void setDescription( String strDescription )
      */
     public List<DocContent> getDocContent( )
     {
-        return _docContent;
+        return (List<DocContent>) ( (ArrayList<DocContent>) _docContent ).clone( );
     }
 
     /**
@@ -355,7 +355,7 @@ public List<DocContent> getDocContent( )
      */
     public void setDocContent( List<DocContent> docContent )
     {
-        _docContent = docContent;
+        _docContent = (List<DocContent>) ( (ArrayList<DocContent>) docContent ).clone( );
     }
 
     /**
@@ -451,7 +451,7 @@ public void setLocked( boolean locked )
      */
     public List<Tag> getTag( )
     {
-        return _tag;
+        return (List<Tag>) ( (ArrayList<Tag>) _tag ).clone( );
     }
 
     /**
@@ -462,7 +462,7 @@ public List<Tag> getTag( )
      */
     public void setTag( List<Tag> tag )
     {
-        _tag = tag;
+        _tag = (List<Tag>) ( (ArrayList<Tag>) tag ).clone( );
     }
 
     /**
@@ -499,7 +499,7 @@ public void deleteTag( Tag tag )
      */
     public List<BlogPublication> getBlogPubilcation( )
     {
-        return _blogPubilcation;
+        return (List<BlogPublication>) ( (ArrayList<BlogPublication>) _blogPubilcation ).clone( );
     }
 
     /**
@@ -510,7 +510,7 @@ public List<BlogPublication> getBlogPubilcation( )
      */
     public void setBlogPubilcation( List<BlogPublication> blogPublication )
     {
-        _blogPubilcation = blogPublication;
+        _blogPubilcation = (List<BlogPublication>) ( (ArrayList<BlogPublication>) blogPublication ).clone( );
     }
 
     /**
@@ -612,18 +612,17 @@ public String getResourceTypeCode( )
 
         return PROPERTY_RESOURCE_TYPE;
     }
-    
-    
+
     /**
      * Return the user informations
      * 
      * @return AdminUser
      */
-    public AdminUser getUserInfos( ) 
+    public AdminUser getUserInfos( )
     {
         return AdminUserHome.findUserByLogin( _strUser );
     }
-    
+
     /**
      * Return the user creator informations
      * 
@@ -633,6 +632,5 @@ public AdminUser getUserCreatorInfos( )
     {
         return AdminUserHome.findUserByLogin( _strUserCreator );
     }
-    
+
 }
-    
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/BlogDAO.java b/src/java/fr/paris/lutece/plugins/blog/business/BlogDAO.java
index f8bdd1c9..d08ab70b 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/BlogDAO.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/BlogDAO.java
@@ -465,7 +465,7 @@ public List<Blog> selectBlogsVersionsList( int nId, Plugin plugin )
         }
         return blogVersionsList;
     }
-    
+
     /**
      * {@inheritDoc }
      */
@@ -480,7 +480,7 @@ public List<String> selectAllUsersEditedBlog( int nId, Plugin plugin )
 
             while ( daoUtil.next( ) )
             {
-            	blogUsersVersionsList.add( daoUtil.getString( 1 ) );
+                blogUsersVersionsList.add( daoUtil.getString( 1 ) );
             }
         }
         return blogUsersVersionsList;
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/BlogFilter.java b/src/java/fr/paris/lutece/plugins/blog/business/BlogFilter.java
index 140847a6..ad532e9f 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/BlogFilter.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/BlogFilter.java
@@ -56,7 +56,7 @@ public class BlogFilter
      */
     public Integer [ ] getTagsId( )
     {
-        return _arrayTagsId;
+        return _arrayTagsId.clone( );
     }
 
     /**
@@ -65,7 +65,7 @@ public class BlogFilter
      */
     public void setTagsId( Integer [ ] arrayTagsId )
     {
-        _arrayTagsId = arrayTagsId;
+        _arrayTagsId = arrayTagsId.clone( );
     }
 
     /**
@@ -93,7 +93,7 @@ public boolean containsIdsCriteria( )
      */
     public Integer [ ] getIds( )
     {
-        return _arrayId;
+        return _arrayId.clone( );
     }
 
     /**
@@ -102,7 +102,7 @@ public boolean containsIdsCriteria( )
      */
     public void setIds( Integer [ ] arrayId )
     {
-        _arrayId = arrayId;
+        _arrayId = arrayId.clone( );
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/BlogHome.java b/src/java/fr/paris/lutece/plugins/blog/business/BlogHome.java
index 36b05cf8..4d422298 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/BlogHome.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/BlogHome.java
@@ -187,7 +187,7 @@ public static List<Blog> getBlogsVersionsList( int nId )
     {
         return _dao.selectBlogsVersionsList( nId, _plugin );
     }
-    
+
     /**
      * Load the data of all users edited the Blog objects and returns them as a list
      * 
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/BlogSearchFilter.java b/src/java/fr/paris/lutece/plugins/blog/business/BlogSearchFilter.java
index 34d16813..9aff2a30 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/BlogSearchFilter.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/BlogSearchFilter.java
@@ -98,7 +98,7 @@ public void setKeywords( String strKeywords )
      */
     public String [ ] getTag( )
     {
-        return _strTag;
+        return _strTag.clone( );
     }
 
     /**
@@ -109,7 +109,7 @@ public void setKeywords( String strKeywords )
      */
     public void setTag( String [ ] strTag )
     {
-        this._strTag = strTag;
+        this._strTag = strTag.clone( );
     }
 
     /**
@@ -132,7 +132,7 @@ public String getUser( )
     {
         return _strUser;
     }
-    
+
     /**
      * Sets the User Edited blog
      * 
@@ -141,7 +141,7 @@ public String getUser( )
      */
     public void setUserEditedBlogVersion( String userEditedBlogVersion )
     {
-    	_strUserEditedBlogVersion = userEditedBlogVersion;
+        _strUserEditedBlogVersion = userEditedBlogVersion;
     }
 
     /**
@@ -179,7 +179,7 @@ public void setIsUnpulished( boolean isUnpulished )
      */
     public Date getUpdateDateAfter( )
     {
-        return _dateUpdateDateAfter;
+        return (Date) _dateUpdateDateAfter.clone( );
     }
 
     /**
@@ -190,7 +190,7 @@ public Date getUpdateDateAfter( )
      */
     public void setUpdateDateAfter( Date dateUpdateDateAfter )
     {
-        _dateUpdateDateAfter = dateUpdateDateAfter;
+        _dateUpdateDateAfter = (Date) dateUpdateDateAfter.clone( );
     }
 
     /**
@@ -200,7 +200,7 @@ public void setUpdateDateAfter( Date dateUpdateDateAfter )
      */
     public Date getUpdateDateBefor( )
     {
-        return _dateUpdateDateBefor;
+        return (Date) _dateUpdateDateBefor.clone( );
     }
 
     /**
@@ -211,7 +211,7 @@ public Date getUpdateDateBefor( )
      */
     public void setUpdateDateBefor( Date dateUpdateDateBefor )
     {
-        _dateUpdateDateBefor = dateUpdateDateBefor;
+        _dateUpdateDateBefor = (Date) dateUpdateDateBefor.clone( );
     }
 
 }
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/DocContent.java b/src/java/fr/paris/lutece/plugins/blog/business/DocContent.java
index 3848e696..894de2b3 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/DocContent.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/DocContent.java
@@ -34,6 +34,7 @@
 package fr.paris.lutece.plugins.blog.business;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -46,7 +47,7 @@ public class DocContent implements Serializable
      * 
      */
     private static final long serialVersionUID = 1L;
-    
+
     private int _nIdDocContent;
     private String _strTextValue;
     private byte [ ] _bytes;
@@ -105,7 +106,7 @@ public String getTextValue( )
      */
     public void setBinaryValue( byte [ ] bytes )
     {
-        _bytes = bytes;
+        _bytes = bytes.clone( );
     }
 
     /**
@@ -115,7 +116,7 @@ public void setBinaryValue( byte [ ] bytes )
      */
     public byte [ ] getBinaryValue( )
     {
-        return _bytes;
+        return _bytes.clone( );
     }
 
     /**
@@ -167,7 +168,7 @@ public ContentType getContentType( )
      */
     public List<Blog> getBlogs( )
     {
-        return _blogs;
+        return (List<Blog>) ( (ArrayList<Blog>) _blogs ).clone( );
     }
 
     /**
@@ -178,7 +179,7 @@ public List<Blog> getBlogs( )
      */
     public void setBlogs( List<Blog> blogs )
     {
-        this._blogs = blogs;
+        this._blogs = (List<Blog>) ( (ArrayList<Blog>) blogs ).clone( );
     }
 
     /**
@@ -194,7 +195,8 @@ public int getPriority( )
     /**
      * Sets the priority
      * 
-     * @param nPriority the priority to set
+     * @param nPriority
+     *            the priority to set
      */
     public void setPriority( int nPriority )
     {
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/DocContentDAO.java b/src/java/fr/paris/lutece/plugins/blog/business/DocContentDAO.java
index 8bb1dffc..42632bee 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/DocContentDAO.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/DocContentDAO.java
@@ -125,7 +125,7 @@ public void insertDocContentInBlog( int nIdBlog, int nIdDocument, int nPriority,
     @Override
     public List<DocContent> loadDocContentByIdHtemldoc( int idBlog, Plugin plugin )
     {
-        List<DocContent> listDoc = new ArrayList<DocContent>( );
+        List<DocContent> listDoc = new ArrayList<>( );
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_CONTENT, plugin ) )
         {
             daoUtil.setInt( 1, idBlog );
@@ -273,7 +273,7 @@ public ContentType loadContentType( int idType, Plugin plugin )
     @Override
     public List<ContentType> loadListContentType( Plugin plugin )
     {
-        List<ContentType> listcontentType = new ArrayList<ContentType>( );
+        List<ContentType> listcontentType = new ArrayList<>( );
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_CONTENT_TYPE, plugin ) )
         {
 
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/DocContentHome.java b/src/java/fr/paris/lutece/plugins/blog/business/DocContentHome.java
index 7ca65c5f..3fdd313f 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/DocContentHome.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/DocContentHome.java
@@ -74,11 +74,11 @@ public static void create( DocContent docContent )
      *            the document id
      * @param nPriority
      *            the priority
-     *            
+     * 
      */
     public static void insertInBlog( int nIdBlog, int nIdDocument, int nPriority )
     {
-        _dao.insertDocContentInBlog( nIdBlog, nIdDocument, nPriority,  _plugin );
+        _dao.insertDocContentInBlog( nIdBlog, nIdDocument, nPriority, _plugin );
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/IBlogDAO.java b/src/java/fr/paris/lutece/plugins/blog/business/IBlogDAO.java
index 0d47608f..3d947c00 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/IBlogDAO.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/IBlogDAO.java
@@ -157,7 +157,7 @@ public interface IBlogDAO
      * @return The list which contains the data of all the blog objects
      */
     List<Blog> selectBlogsVersionsList( int nId, Plugin plugin );
-    
+
     /**
      * Load the data of all the users edited the blog and returns them as a list
      * 
@@ -167,7 +167,6 @@ public interface IBlogDAO
      */
     List<String> selectAllUsersEditedBlog( int nId, Plugin plugin );
 
-
     /**
      * Load the id of all the Blog objects and returns them as a list
      * 
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogListPortlet.java b/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogListPortlet.java
index ce6f4cd1..f4f277a5 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogListPortlet.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogListPortlet.java
@@ -192,7 +192,7 @@ public int getPageTemplateDocument( )
      */
     public List<BlogPublication> getArrayBlogs( )
     {
-        return _arrayBlogs;
+        return (List<BlogPublication>) ( (ArrayList<BlogPublication>) _arrayBlogs ).clone( );
     }
 
     /**
@@ -201,7 +201,7 @@ public List<BlogPublication> getArrayBlogs( )
      */
     public void setArrayBlogs( List<BlogPublication> arrayBlogs )
     {
-        _arrayBlogs = arrayBlogs;
+        _arrayBlogs = (List<BlogPublication>) ( (ArrayList<BlogPublication>) arrayBlogs ).clone( );
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogPublication.java b/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogPublication.java
index baee6395..f29f203a 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogPublication.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/portlet/BlogPublication.java
@@ -95,7 +95,7 @@ public void setIdPortlet( int nIdPortlet )
      */
     public Date getDateBeginPublishing( )
     {
-        return _dateBeginPublishing;
+        return (Date) _dateBeginPublishing.clone( );
     }
 
     /**
@@ -104,7 +104,7 @@ public Date getDateBeginPublishing( )
      */
     public void setDateBeginPublishing( Date datePublishing )
     {
-        _dateBeginPublishing = datePublishing;
+        _dateBeginPublishing = (Date) datePublishing.clone( );
     }
 
     /**
@@ -112,7 +112,7 @@ public void setDateBeginPublishing( Date datePublishing )
      */
     public Date getDateEndPublishing( )
     {
-        return _dateEndPublishing;
+        return (Date) _dateEndPublishing.clone( );
     }
 
     /**
@@ -121,7 +121,7 @@ public Date getDateEndPublishing( )
      */
     public void setDateEndPublishing( Date datePublishing )
     {
-        _dateEndPublishing = datePublishing;
+        _dateEndPublishing = (Date) datePublishing.clone( );
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/blog/business/portlet/PortletFilter.java b/src/java/fr/paris/lutece/plugins/blog/business/portlet/PortletFilter.java
index d51388c9..346c15e6 100644
--- a/src/java/fr/paris/lutece/plugins/blog/business/portlet/PortletFilter.java
+++ b/src/java/fr/paris/lutece/plugins/blog/business/portlet/PortletFilter.java
@@ -67,7 +67,7 @@ public class PortletFilter
      */
     public void setPageName( String [ ] strPageTitle )
     {
-        this._tabPageName = strPageTitle;
+        this._tabPageName = strPageTitle.clone( );
     }
 
     /**
@@ -77,7 +77,7 @@ public void setPageName( String [ ] strPageTitle )
      */
     public String [ ] getPageName( )
     {
-        return _tabPageName;
+        return _tabPageName.clone( );
     }
 
     /**
@@ -88,7 +88,7 @@ public void setPageName( String [ ] strPageTitle )
      */
     public void setPortletName( String [ ] strPortletTitle )
     {
-        this._tabPortletName = strPortletTitle;
+        this._tabPortletName = strPortletTitle.clone( );
     }
 
     /**
@@ -98,7 +98,7 @@ public void setPortletName( String [ ] strPortletTitle )
      */
     public String [ ] getPortletName( )
     {
-        return _tabPortletName;
+        return _tabPortletName.clone( );
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java b/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java
index 2d635a97..c4ca2c00 100644
--- a/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java
+++ b/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java
@@ -213,7 +213,7 @@ public void updateBlog( Blog blog, List<DocContent> docContent )
                 {
                     if ( listDocContent.isEmpty( ) || listDocContent.removeIf( t -> t.getId( ) == docCont.getId( ) ) || docCont.getId( ) == 0 )
                     {
-                        if ( listToCompare.stream( ).noneMatch( c ->  ( c.getId( ) == docCont.getId( ) ) && ( c.getPriority( ) == docCont.getPriority( ) ) ) )
+                        if ( listToCompare.stream( ).noneMatch( c -> ( c.getId( ) == docCont.getId( ) ) && ( c.getPriority( ) == docCont.getPriority( ) ) ) )
                         {
 
                             updateDocContent( docCont, blog.getId( ) );
@@ -271,7 +271,7 @@ public void updateBlogWithoutVersion( Blog blog, List<DocContent> docContent )
 
                     if ( listDocContent.isEmpty( ) || listDocContent.removeIf( t -> t.getId( ) == docCont.getId( ) ) || docCont.getId( ) == 0 )
                     {
-                        if ( listToCompare.stream( ).noneMatch( c ->  ( c.getId( ) == docCont.getId( ) ) && ( c.getPriority( ) == docCont.getPriority( ) ) ) )
+                        if ( listToCompare.stream( ).noneMatch( c -> ( c.getId( ) == docCont.getId( ) ) && ( c.getPriority( ) == docCont.getPriority( ) ) ) )
                         {
 
                             updateDocContent( docCont, blog.getId( ) );
diff --git a/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogSearchItem.java b/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogSearchItem.java
index ebed2ac7..5b8edf9d 100644
--- a/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogSearchItem.java
+++ b/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogSearchItem.java
@@ -79,10 +79,8 @@ public BlogSearchItem( Document document )
 
     public static final String FIELD_DATE_UPDATE = "dateUpdate";
     /*
-     * Users  
+     * Users
      */
     public static final String FIELD_USERS_EDITED_BLOG = "usersEditedBlog";
 
-    
-
 }
diff --git a/src/java/fr/paris/lutece/plugins/blog/service/docsearch/DefaultBlogIndexer.java b/src/java/fr/paris/lutece/plugins/blog/service/docsearch/DefaultBlogIndexer.java
index 6af9d044..df55e958 100644
--- a/src/java/fr/paris/lutece/plugins/blog/service/docsearch/DefaultBlogIndexer.java
+++ b/src/java/fr/paris/lutece/plugins/blog/service/docsearch/DefaultBlogIndexer.java
@@ -221,7 +221,7 @@ public static org.apache.lucene.document.Document getDocument( Blog blog ) throw
 
         doc.add( new TextField( BlogSearchItem.FIELD_TAGS, getTagToIndex( blog ), Field.Store.YES ) );
         doc.add( new TextField( BlogSearchItem.FIELD_USERS_EDITED_BLOG, getUsersEditedBlogVersions( blog ), Field.Store.YES ) );
-        
+
         FieldType ft = new FieldType( StringField.TYPE_STORED );
         ft.setOmitNorms( false );
         doc.add( new Field( SearchItem.FIELD_DATE, DateTools.timeToString( blog.getUpdateDate( ).getTime( ), DateTools.Resolution.MINUTE ), ft ) );
@@ -310,20 +310,23 @@ private static String getTagToIndex( Blog blog )
 
         return sbContentToIndex.toString( );
     }
+
     /**
      * Set the user list edited the blog
-     * @param blog The blog to index
+     * 
+     * @param blog
+     *            The blog to index
      * @return The list of users
      */
     private static String getUsersEditedBlogVersions( Blog blog )
     {
         StringBuilder sbContentToIndex = new StringBuilder( );
-        List<String> usersList= BlogHome.getUsersEditedBlogVersions(blog.getId() );
-        
+        List<String> usersList = BlogHome.getUsersEditedBlogVersions( blog.getId( ) );
+
         for ( String user : usersList )
-        {	
-        		sbContentToIndex.append( BLANK_SPACE );
-        		sbContentToIndex.append( user );	
+        {
+            sbContentToIndex.append( BLANK_SPACE );
+            sbContentToIndex.append( user );
         }
 
         return sbContentToIndex.toString( );
diff --git a/src/java/fr/paris/lutece/plugins/blog/web/BlogApp.java b/src/java/fr/paris/lutece/plugins/blog/web/BlogApp.java
index d459bfb4..b5e76537 100644
--- a/src/java/fr/paris/lutece/plugins/blog/web/BlogApp.java
+++ b/src/java/fr/paris/lutece/plugins/blog/web/BlogApp.java
@@ -129,7 +129,7 @@ public XPage getBlogDetails( HttpServletRequest request )
         model.put( MARK_LIST_DOC, listBlogs );
         model.put( MARK_LIST_TAG, TagHome.getTagsReferenceList( ) );
 
-        return getXPage( TEMPLATE_VIEW_BLOG, request.getLocale( ), model );
+        return getXPage( TEMPLATE_VIEW_BLOG, getLocale( request ), model );
     }
 
 }
diff --git a/src/java/fr/paris/lutece/plugins/blog/web/BlogFileServlet.java b/src/java/fr/paris/lutece/plugins/blog/web/BlogFileServlet.java
index 6c113bf3..c74c9241 100644
--- a/src/java/fr/paris/lutece/plugins/blog/web/BlogFileServlet.java
+++ b/src/java/fr/paris/lutece/plugins/blog/web/BlogFileServlet.java
@@ -35,6 +35,7 @@
 
 import fr.paris.lutece.plugins.blog.business.DocContent;
 import fr.paris.lutece.plugins.blog.business.DocContentHome;
+import fr.paris.lutece.portal.service.util.AppException;
 import fr.paris.lutece.portal.service.util.AppLogService;
 import fr.paris.lutece.portal.service.util.AppPropertiesService;
 
@@ -135,9 +136,18 @@ protected void processRequest( HttpServletRequest request, HttpServletResponse h
      *             the io exception
      */
     @Override
-    protected void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException
+    protected void doGet( HttpServletRequest request, HttpServletResponse response ) throws AppException
     {
-        processRequest( request, response );
+
+        try
+        {
+            processRequest( request, response );
+        }
+        catch( ServletException | IOException e )
+        {
+            throw new AppException( "Request error", e );
+        }
+
     }
 
     /**
@@ -153,9 +163,16 @@ protected void doGet( HttpServletRequest request, HttpServletResponse response )
      *             the io exception
      */
     @Override
-    protected void doPost( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException
+    protected void doPost( HttpServletRequest request, HttpServletResponse response ) throws AppException
     {
-        processRequest( request, response );
+        try
+        {
+            processRequest( request, response );
+        }
+        catch( ServletException | IOException e )
+        {
+            throw new AppException( "Request error", e );
+        }
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java b/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java
index 816938ae..e10a495a 100644
--- a/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java
+++ b/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java
@@ -78,7 +78,6 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
@@ -115,6 +114,10 @@
 @Controller( controllerJsp = "ManageBlogs.jsp", controllerPath = "jsp/admin/plugins/blog/", right = "BLOG_MANAGEMENT" )
 public class BlogJspBean extends ManageBlogJspBean
 {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 9149742923528515045L;
     // Templates
     private static final String TEMPLATE_MANAGE_BLOGS = "/admin/plugins/blog/manage_blogs.html";
     private static final String TEMPLATE_CREATE_BLOG = "/admin/plugins/blog/create_blog.html";
@@ -153,8 +156,7 @@ public class BlogJspBean extends ManageBlogJspBean
     protected static final String PARAMETER_APPLY = "apply";
     protected static final String PARAMETER_TYPE_ID = "idType";
     protected static final String PARAMETER_CONTENT_ID = "idContent";
-    protected static final String PARAMETER_CONTENT_ACTION= "contentAction";
-    
+    protected static final String PARAMETER_CONTENT_ACTION = "contentAction";
 
     // Properties for page titles
     private static final String PROPERTY_PAGE_TITLE_MANAGE_BLOG = "blog.manage_blog.pageTitle";
@@ -797,7 +799,7 @@ public String getModifyBlog( HttpServletRequest request ) throws AccessDeniedExc
             nVersion = Integer.parseInt( strResetVersion );
         }
 
-        if ( strResetVersion != null && strResetVersion != null )
+        if ( strResetVersion != null )
         {
 
             _blog = BlogHome.findVersion( nId, nVersion );
@@ -830,7 +832,7 @@ public String getModifyBlog( HttpServletRequest request ) throws AccessDeniedExc
         lockBlog( nId, sessionId );
 
         _blog.getTag( ).sort( ( tg1, tg2 ) -> tg1.getPriority( ) - tg2.getPriority( ) );
-        _blog.getDocContent( ).sort( ( dc1, dc2 ) -> dc1.getPriority ( ) - dc2.getPriority ( ) );
+        _blog.getDocContent( ).sort( ( dc1, dc2 ) -> dc1.getPriority( ) - dc2.getPriority( ) );
         Map<String, Object> model = getModel( );
 
         boolean bPermissionCreate = RBACService.isAuthorized( Tag.PROPERTY_RESOURCE_TYPE, RBAC.WILDCARD_RESOURCES_ID, Tag.PERMISSION_CREATE, getUser( ) );
@@ -1168,12 +1170,12 @@ public String removeContent( HttpServletRequest request )
 
                 return JsonUtil.buildJsonResponse( new JsonResponse( "BLOG_LOCKED" ) );
             }
-        
-        DocContent docCont  = _blog.getDocContent( ).stream( ).filter( dc -> dc.getId( ) == nIdDoc ).collect( Collectors.toList( ) ).get( 0 );
+
+        DocContent docCont = _blog.getDocContent( ).stream( ).filter( dc -> dc.getId( ) == nIdDoc ).collect( Collectors.toList( ) ).get( 0 );
         List<DocContent> listDocs = _blog.getDocContent( ).stream( ).map( dc -> {
-            if ( ( dc.getPriority( ) > docCont.getPriority( ) ) && ( docCont.getId( ) != dc.getId( ) ) ) 
+            if ( ( dc.getPriority( ) > docCont.getPriority( ) ) && ( docCont.getId( ) != dc.getId( ) ) )
             {
-                
+
                 dc.setPriority( dc.getPriority( ) - 1 );
             }
             return dc;
@@ -1186,7 +1188,7 @@ public String removeContent( HttpServletRequest request )
         return JsonUtil.buildJsonResponse( new JsonResponse( nIdDoc ) );
 
     }
-    
+
     /**
      * Return Json if the the content is updated
      *
@@ -1217,7 +1219,7 @@ public String doUpdatePriorityContent( HttpServletRequest request )
 
                 return JsonUtil.buildJsonResponse( new JsonResponse( "BLOG_LOCKED" ) );
             }
-              
+
         for ( DocContent dc : _blog.getDocContent( ) )
         {
             if ( dc.getId( ) == Integer.parseInt( strIdDocContent ) )
@@ -1256,7 +1258,7 @@ public String doUpdatePriorityContent( HttpServletRequest request )
         return JsonUtil.buildJsonResponse( new JsonResponse( String.valueOf( docCont.getId( ) ) ) );
 
     }
-    
+
     /**
      * 
      * @param request
diff --git a/src/java/fr/paris/lutece/plugins/blog/web/ManageBlogJspBean.java b/src/java/fr/paris/lutece/plugins/blog/web/ManageBlogJspBean.java
index cfada4e7..abe408eb 100644
--- a/src/java/fr/paris/lutece/plugins/blog/web/ManageBlogJspBean.java
+++ b/src/java/fr/paris/lutece/plugins/blog/web/ManageBlogJspBean.java
@@ -51,6 +51,10 @@
  */
 public abstract class ManageBlogJspBean extends MVCAdminJspBean
 {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -6668218805735261134L;
     protected static final String UNAUTHORIZED = "Unauthorized";
     // Rights
     public static final String RIGHT_MANAGEHTMLDOCS = "BLOG_MANAGEMENT";