diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/SxxxTableView.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/SxxxTableView.java
index 7b1f08177..fb4c2da09 100644
--- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/SxxxTableView.java
+++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/SxxxTableView.java
@@ -74,8 +74,6 @@ protected void preDestroy() {
 	protected void createView(final Composite parent) {
 		super.createView(parent);
 		addCalculateMissingTablesPanel(parent);
-		// Move the panel to top position
-		calculateMissingTablesPanel.moveAbove(parent.getChildren()[0]);
 	}
 
 	@Override
@@ -174,6 +172,8 @@ public void widgetSelected(final SelectionEvent e) {
 
 		calculateMissingTablesPanel = panel;
 		updateCalculateMissingTablesPanel();
+		// Move the panel to top of view
+		calculateMissingTablesPanel.moveAbove(parent.getChildren()[0]);
 	}
 
 	private void updateCalculateMissingTablesPanel() {
diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
index 91eb68213..31881e8ec 100644
--- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
+++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
@@ -426,8 +426,8 @@ public Table transformToTable(final TableInfo tableInfo,
 			return emptyTable;
 		}
 		final Table resultTable = TableServiceUtils.filterRequestValue(
-				EcoreUtil.copy((Table) table), tableType, modelSession,
-				getModelService(tableInfo), controlAreaIds);
+				EcoreUtil.copy((Table) table), tableType, tableInfo,
+				modelSession, getModelService(tableInfo), controlAreaIds);
 		TableServiceUtils.clearEmptyRow(resultTable);
 		getModelService(tableInfo).addAdditionRow((Table) table, resultTable);
 		sortTable(resultTable, tableInfo);
@@ -629,6 +629,7 @@ public Map<TableInfo, Table> transformTables(final IProgressMonitor monitor,
 				while (!TableService.isTransformComplete(tableInfo, null)) {
 					Thread.sleep(2000);
 				}
+				storageFootnotes(ToolboxFileRole.SESSION, tableInfo, table);
 				result.put(tableInfo, table);
 				monitor.worked(1);
 			} catch (final Exception e) {
diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceUtils.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceUtils.java
index dbf2e70e3..e3b4a2e6d 100644
--- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceUtils.java
+++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceUtils.java
@@ -254,11 +254,16 @@ public static void calculateAllMissingTables(
 	}
 
 	protected static Table filterRequestValue(final Table table,
-			final TableType tableType, final IModelSession modelsession,
+			final TableType tableType, final TableInfo tableInfo,
+			final IModelSession modelsession,
 			final PlanPro2TableTransformationService transformationService,
 			final Set<String> controlAreaIds) {
 		final Table result = filterTableByState(table, tableType);
-
+		// Worknotes table need only regard on table state
+		if (tableInfo.shortcut()
+				.equalsIgnoreCase(ToolboxConstants.WORKNOTES_TABLE_SHORTCUT)) {
+			return result;
+		}
 		if (tableType == TableType.DIFF) {
 			filterRowGroupBelongToControlAreaByDiffState(result, modelsession,
 					transformationService, controlAreaIds);