diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
index 62e4beeaaf9..bbd9cd44a2b 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
@@ -66,19 +66,23 @@ Contributors:
       </page> 
 -->
       <page
-            objectClass="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem"
             name="%PropertyPage.ServerLauncherSettings" 
             class="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage"
             id="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage">
             <filter name="serverLaunchPP" value="true"/>
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem"/>
+         </enabledWhen>
       </page>
 
       
        <page
-            objectClass="org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem"
             name="%PropertyPage.Service"
             class="org.eclipse.rse.files.ui.propertypages.FileServicesPropertyPage"
             id="org.eclipse.rse.files.ui.propertypages.FileServicesPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem"/>
+         </enabledWhen>
       </page>
       
    </extension>
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml b/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml
index 6fd76dca26c..b92020a9661 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml
@@ -38,17 +38,21 @@ Contributors:
    <extension
          point="org.eclipse.ui.propertyPages">   
       <page
-            objectClass="org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem"
             name="%PropertyPage.ServerLauncherSettings" 
             class="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage"
             id="org.eclipse.rse.ui.propertypages.serverLauncherPropertyPage">
             <filter name="serverLaunchPP" value="true"/>
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem"
             name="%PropertyPage.Service"
             class="org.eclipse.rse.processes.ui.propertypages.ProcessServicesPropertyPage"
             id="org.eclipse.rse.processes.ui.propertypages.ProcessServicesPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem"/>
+         </enabledWhen>
       </page>
    </extension>
    
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
index e892ecc872a..0a6f050b678 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
@@ -36,30 +36,33 @@ Contributors:
          point="org.eclipse.ui.propertyPages">
 
       <page
-            objectClass="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem"
             name="%PropertyPage.EnvVariables"
             class="org.eclipse.rse.shells.ui.propertypages.EnvironmentVariablesPropertyPage"
             id="org.eclipse.rse.shells.ui.propertypages.EnvironmentVariablesPropertyPage">
-            
             <!--
             <filter name="envVarPP" value="true"/>
             -->
-            
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem"/>
+         </enabledWhen>
       </page> 
-   
       
       <page
-            objectClass="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem"
             name="%PropertyPage.ShellSettings"
             class="org.eclipse.rse.shells.ui.propertypages.SystemShellPropertyPage"
             id="org.eclipse.rse.shells.ui.propertypages.SystemShellPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem"/>
+         </enabledWhen>
       </page>
 
         <page
-            objectClass="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem"
             name="%PropertyPage.Service"
             class="org.eclipse.rse.shells.ui.propertypages.ShellServicesPropertyPage"
             id="org.eclipse.rse.shells.ui.propertypages.ShellServicesPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem"/>
+         </enabledWhen>
       </page>
       
    </extension>
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 9829224b97b..73897e0a623 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -571,15 +571,10 @@ Contributors:
             class="org.eclipse.rse.ui.propertypages.SystemFilterPropertyPage"
             id="org.eclipse.rse.SystemFilterPropertyPage">
          <enabledWhen>
-            <instanceof value="org.eclipse.rse.core.filters.ISystemFilter"/>
-         </enabledWhen>
-      </page>
-      <page
-            name="%PropertyPage.Filter"
-            class="org.eclipse.rse.ui.propertypages.SystemFilterPropertyPage"
-            id="org.eclipse.rse.SystemFilterReferencePropertyPage">
-         <enabledWhen>
-            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterReference"/>
+         	<or>
+            	<instanceof value="org.eclipse.rse.core.filters.ISystemFilter"/>
+	            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterReference"/>
+         	</or>
          </enabledWhen>
       </page>
       <page
@@ -588,16 +583,10 @@ Contributors:
             id="org.eclipse.rse.SystemChangeFilterPropertyPage">
             <filter name="showChangeFilterStringPropertyPage" value="true"/>
          <enabledWhen>
-            <instanceof value="org.eclipse.rse.core.filters.ISystemFilter"/>
-         </enabledWhen>
-      </page>
-      <page
-            name="%PropertyPage.ChangeFilter"
-            class="org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage"
-            id="org.eclipse.rse.SystemChangeFilterReferencePropertyPage">
-            <filter name="showChangeFilterStringPropertyPage" value="true"/>
-         <enabledWhen>
-            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterReference"/>
+         	<or>
+            	<instanceof value="org.eclipse.rse.core.filters.ISystemFilter"/>
+	            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterReference"/>
+         	</or>
          </enabledWhen>
       </page>
       <page