diff --git a/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml b/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml
index 2e506962a1a..7a8bc4baf49 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml
@@ -40,26 +40,18 @@ Contributors:
   <!-- ============================================ -->
    <extension
          point="org.eclipse.ui.propertyPages">
-     <page 
-            objectClass="org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem"
+       <page 
             name="%PropertyPage.ServerConnectionSecurity"
             class="org.eclipse.rse.ui.propertypages.ServerConnectionSecurityPropertyPage"
             id="org.eclipse.rse.connectionsecurity.PropertyPage">
             <filter name="serverLaunchPP" value="true"/>
-      </page>
-      <page 
-            objectClass="org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem"
-            name="%PropertyPage.ServerConnectionSecurity"
-            class="org.eclipse.rse.ui.propertypages.ServerConnectionSecurityPropertyPage"
-            id="org.eclipse.rse.connectionsecurity.PropertyPage2">
-            <filter name="serverLaunchPP" value="true"/>
-      </page>
-       <page 
-            objectClass="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem"
-            name="%PropertyPage.ServerConnectionSecurity"
-            class="org.eclipse.rse.ui.propertypages.ServerConnectionSecurityPropertyPage"
-            id="org.eclipse.rse.connectionsecurity.PropertyPage3">
-            <filter name="serverLaunchPP" value="true"/>
+         <enabledWhen>
+         	<or>
+	            <instanceof value="org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem"/>
+	            <instanceof value="org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem"/>
+            	<instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem"/>
+            </or>
+         </enabledWhen>
       </page>
    </extension>
 </plugin>
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
index 4e288efa6b5..33f6e1d8720 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
@@ -42,9 +42,7 @@ Contributors:
    			typefilter="folder"
    			id="org.eclipse.rse.eclipse.filesystem.createproject.">
             <visibility> 
-            	<and>
-                	<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>   
-                </and> 
+                <objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>   
             </visibility>
             
          <action
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 9a970582c22..9829224b97b 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -511,16 +511,20 @@ Contributors:
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            objectClass="org.eclipse.rse.core.subsystems.ISubSystem"
             name="%PropertyPage.SubSystem"
             class="org.eclipse.rse.ui.propertypages.SystemSubSystemPropertyPageCore"
             id="org.eclipse.rse.SubSystemsPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.subsystems.ISubSystem"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.model.IHost"
             name="%PropertyPage.Connection"
             class="org.eclipse.rse.ui.propertypages.SystemConnectionPropertyPage"
             id="org.eclipse.rse.SystemPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.model.IHost"/>
+         </enabledWhen>
       </page>
       <!-- with move to services this should disappear
       <page
@@ -531,78 +535,102 @@ Contributors:
       </page>
       -->
       <page
-            objectClass="org.eclipse.rse.core.model.IHost"
             name="%PropertyPage.Connection.ConnectorServices"
             class="org.eclipse.rse.ui.propertypages.SystemConnectorServicesPropertyPage"
             id="org.eclipse.rse.ui.propertypages.SystemConnectorServicesPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.model.IHost"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilterPool"
             name="%PropertyPage.FilterPool"
             class="org.eclipse.rse.ui.propertypages.SystemFilterPoolPropertyPage"
             id="org.eclipse.rse.SystemFilterPoolPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterPool"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilterPoolReference"
             name="%PropertyPage.Reference"
             class="org.eclipse.rse.ui.propertypages.SystemFilterPoolReferencePropertyPage"
             id="org.eclipse.rse.SystemFilterPoolReferencePropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterPoolReference"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilterPoolReference"
             name="%PropertyPage.ReferencedFilterPool"
             class="org.eclipse.rse.ui.propertypages.SystemFilterPoolPropertyPage"
             id="org.eclipse.rse.SystemFilterPoolReferencePropertyPage2">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterPoolReference"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilter"
             name="%PropertyPage.Filter"
             class="org.eclipse.rse.ui.propertypages.SystemFilterPropertyPage"
             id="org.eclipse.rse.SystemFilterPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilter"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilterReference"
             name="%PropertyPage.Filter"
             class="org.eclipse.rse.ui.propertypages.SystemFilterPropertyPage"
             id="org.eclipse.rse.SystemFilterReferencePropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterReference"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilter"
             name="%PropertyPage.ChangeFilter"
             class="org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage"
             id="org.eclipse.rse.SystemChangeFilterPropertyPage">
             <filter name="showChangeFilterStringPropertyPage" value="true"/>
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilter"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilterReference"
             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"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.filters.ISystemFilterString"
             name="%PropertyPage.FilterString"
             class="org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage"
             id="org.eclipse.rse.SystemFilterStringPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.filters.ISystemFilterString"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.ui.view.team.SystemTeamViewCategoryNode"
             name="%PropertyPage.TeamViewCategoryNode"
             class="org.eclipse.rse.ui.propertypages.SystemTeamViewCategoryPropertyPage"
             id="org.eclipse.rse.SystemTeamViewCategoryPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.ui.view.team.SystemTeamViewCategoryNode"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.core.model.ISystemProfile"
             name="%PropertyPage.Profile"
             class="org.eclipse.rse.ui.propertypages.SystemTeamViewProfilePropertyPage"
             id="org.eclipse.rse.SystemProfilePropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.core.model.ISystemProfile"/>
+         </enabledWhen>
       </page>
       <page
-            objectClass="org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode"
             name="%PropertyPage.TeamViewSubSystemFactoryNode"
             class="org.eclipse.rse.ui.propertypages.SystemTeamViewSubSystemConfigurationPropertyPage"
             id="org.eclipse.rse.SystemTeamViewSubSystemFactoryPropertyPage">
+         <enabledWhen>
+            <instanceof value="org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode"/>
+         </enabledWhen>
       </page>
       
    </extension>