diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
index fcd36620500a17321beb928dd1397a281ac0ddb1..bfde97a096b789985df37c15851c11aabc31afb3 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
@@ -101,7 +101,7 @@ public class ExperimentViewer extends GenericExperimentViewer
     @Override
     protected Component tryCreateLowerLeftComponent()
     {
-        if (viewContext.isSimpleMode())
+        if (viewContext.isSimpleOrEmbeddedMode())
         {
             return null; // no processing in simple view mode
         }
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java
index 25bc49a4740f1fdf37c73b19ffad36c9f1c4b078..988402c740106508b9ca560afe4b080af356a7fd 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java
@@ -48,7 +48,7 @@ class RawDataSampleProvider extends AbstractTableModelProvider<Sample>
     }
 
     @Override
-    public TypedTableModel<Sample> createTableModel(int maxSize)
+    public TypedTableModel<Sample> createTableModel()
     {
         List<MsInjectionSample> samples = service.listRawDataSamples(sessionToken);
         TypedTableModelBuilder<Sample> builder = new TypedTableModelBuilder<Sample>();
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java
index 9928c97cf7f20ecc3dfb8d8e96a702eb368d7f04..5086c140305f83e9f4e9ede5627bd08883b6be29 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java
@@ -50,7 +50,7 @@ public class BiologicalSampleProvider extends AbstractCommonTableModelProvider<S
     }
 
     @Override
-    protected TypedTableModel<Sample> createTableModel(int maxSize)
+    protected TypedTableModel<Sample> createTableModel()
     {
         DetailedSearchCriteria criteria = new DetailedSearchCriteria();
         criteria.setConnection(SearchCriteriaConnection.MATCH_ALL);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java
index 2520b00ae5b5cfa5214ae6db90892b4819650588..a010b147b0c505c5d0cfb7ead4c66bd98f54a03a 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java
@@ -56,7 +56,7 @@ public class DataSetProteinProvider extends AbstractTableModelProvider<DataSetPr
     }
 
     @Override
-    protected TypedTableModel<DataSetProtein> createTableModel(int maxSize)
+    protected TypedTableModel<DataSetProtein> createTableModel()
     {
         List<DataSetProtein> proteins =
                 server.listProteinsByExperimentAndReference(sessionToken, experimentID,
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java
index a4be66e7a87c5fa360a6a9efb979bc3abd3ca08d..0d7a9300137667553df05f2b47fd3be7922d3a14 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java
@@ -49,7 +49,7 @@ public class ParentlessMsInjectionSampleProvider extends AbstractCommonTableMode
     }
 
     @Override
-    protected TypedTableModel<Sample> createTableModel(int maxSize)
+    protected TypedTableModel<Sample> createTableModel()
     {
         DetailedSearchCriteria criteria = new DetailedSearchCriteria();
         criteria.setConnection(SearchCriteriaConnection.MATCH_ALL);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java
index 8ff0de653fc7006393fe902838c230278fe8b5c0..db3a10c0b53d54e834a608f011686bdc8bb4b132 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java
@@ -49,7 +49,7 @@ public class ProteinSequenceProvider extends AbstractTableModelProvider<ProteinS
     }
 
     @Override
-    protected TypedTableModel<ProteinSequence> createTableModel(int maxSize)
+    protected TypedTableModel<ProteinSequence> createTableModel()
     {
         List<ProteinSequence> sequences =
                 server.listProteinSequencesByProteinReference(sessionToken, proteinReferenceID);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java
index fdb42de4defd2938eb7e53c4d4c6e08d7be5660c..8ad34751b8bace82076182b83d1bceb916d95d34 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java
@@ -49,7 +49,7 @@ public class ProteinSummaryProvider extends AbstractTableModelProvider<ProteinSu
     }
 
     @Override
-    protected TypedTableModel<ProteinSummary> createTableModel(int maxSize)
+    protected TypedTableModel<ProteinSummary> createTableModel()
     {
         List<ProteinSummary> sumaries = server.listProteinSummariesByExperiment(sessionToken, experimentID);
         TypedTableModelBuilder<ProteinSummary> builder = new TypedTableModelBuilder<ProteinSummary>();
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java
index 85c89b769570e3d0e527def7edbd4ee96c440691..0ba283891da08772ca18efdec4a2088785a1fbf9 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java
@@ -52,7 +52,7 @@ public class ProteinSequenceProviderTest extends AbstractProviderTest
         ProteinSequenceProvider provider =
                 new ProteinSequenceProvider(phosphonetxServer, SESSION_TOKEN, new TechId(42));
 
-        TypedTableModel<ProteinSequence> model = provider.createTableModel(Integer.MAX_VALUE);
+        TypedTableModel<ProteinSequence> model = provider.createTableModel();
 
         assertEquals("[SEQUENCE_SHORT_NAME, DATABASE_NAME_AND_VERSION, SEQUENCE]", getHeaderIDs(model).toString());
         assertEquals("[VARCHAR, VARCHAR, VARCHAR]", getHeaderDataTypes(model).toString());
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java
index e98a8c3b3ea92d793a5f2fb9a01e066d6333865b..8d33570902f0bea7abc435c02557b893d5d7bdf4 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java
@@ -51,7 +51,7 @@ public class ProteinSummaryProviderTest extends AbstractProviderTest
         ProteinSummaryProvider provider =
                 new ProteinSummaryProvider(phosphonetxServer, SESSION_TOKEN, new TechId(12));
 
-        TypedTableModel<ProteinSummary> model = provider.createTableModel(Integer.MAX_VALUE);
+        TypedTableModel<ProteinSummary> model = provider.createTableModel();
 
         assertEquals("[FDR, PROTEIN_COUNT, PEPTIDE_COUNT]", getHeaderIDs(model).toString());
         assertEquals("[REAL, INTEGER, INTEGER]", getHeaderDataTypes(model).toString());