diff --git a/distro/changelog.xml b/distro/changelog.xml
index 5ed6f97..489e5ba 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -3,6 +3,8 @@
 		date="2016-09-14">
 		<Change>[Feature #2335] Added "Get Folder Link" facility</Change>
 		<Change>[Incident #4878] Fixed: Workspace tree not displaying user's name</Change>
+		<Change>[Feature #5116] Implemented Show public folders in Workspace via Smart Folder</Change>
+		<Change>[Feature #5110] Added Enabled/Disabled Public Access to workspace history</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-13-0"
 		date="2016-05-31">
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
index af3d525..3e52185 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
@@ -90,6 +90,7 @@ import org.gcube.portlets.user.workspace.client.event.WebDavUrlEventHandler;
 import org.gcube.portlets.user.workspace.client.event.WsGetFolderLinkEvent;
 import org.gcube.portlets.user.workspace.client.event.WsGetFolderLinkEventHandler;
 import org.gcube.portlets.user.workspace.client.interfaces.EventsTypeEnum;
+import org.gcube.portlets.user.workspace.client.interfaces.GXTCategorySmartFolder;
 import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum;
 import org.gcube.portlets.user.workspace.client.interfaces.SubscriberInterface;
 import org.gcube.portlets.user.workspace.client.model.FileGridModel;
@@ -151,7 +152,7 @@ public class AppController implements SubscriberInterface {
 	private String rootIdentifier = null;
 	private HasWidgets rootPanel;
 	private String selectedSmartFolderId;
-	private String selectedSmartFolderCategory;
+	private GXTCategorySmartFolder selectedSmartFolderCategory;
 	private WorkspaceFeaturesView workspaceFeatures = new WorkspaceFeaturesView();
 	private WorkspaceQuotesView wsQuotesView = new WorkspaceQuotesView();
 	public static final Logger logger = Logger.getLogger("WsAppController");
@@ -1732,7 +1733,7 @@ public class AppController implements SubscriberInterface {
 	 * @see org.gcube.portlets.user.workspace.client.interfaces.SubscriberInterface#smartFolderSelected(java.lang.String, java.lang.String)
 	 */
 	@Override
-	public void smartFolderSelected(final String folderId, final String category) {
+	public void smartFolderSelected(final String folderId, final GXTCategorySmartFolder category) {
 
 		selectedSmartFolderId = folderId;
 		selectedSmartFolderCategory = category;
@@ -1765,7 +1766,7 @@ public class AppController implements SubscriberInterface {
 			});
 		} else {
 
-			if (category != null && !category.isEmpty()) {
+			if (category != null) {
 
 				appContrExplorer.getRpcWorkspaceService().getSmartFolderResultsByCategory(category, new AsyncCallback<List<FileGridModel>>() {