diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
index 2b6d84ebdf0..4f66c122acd 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
@@ -357,13 +357,21 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	{
 		RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString.getString());
 		String container = rffs.getPath();
+		
 		if (container == null)
 			return false;
 		boolean affected = false;
+		
+		String remoteObjectContainer = remoteObjectAbsoluteName;
+		int lastSep = remoteObjectAbsoluteName.lastIndexOf(getSeparator());
+		if (lastSep != -1)
+		{
+			remoteObjectContainer = remoteObjectAbsoluteName.substring(0, lastSep);
+		}
 		if (filterString.getParentSystemFilter().isStringsCaseSensitive())
-			affected = container.equals(remoteObjectAbsoluteName);
+			affected = container.equals(remoteObjectContainer);
 		else
-			affected = container.equalsIgnoreCase(remoteObjectAbsoluteName);
+			affected = container.equalsIgnoreCase(remoteObjectContainer);
 
 		//UniversalSystemPlugin.logDebugMessage(
 		//    "UniversalFileSubSystemImpl::doesFilterStringListContentsOf",
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
index 21631be2e31..e9f1148ff94 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
@@ -704,7 +704,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
     	{
     	  for (int idx=0; !would && (idx<strings.length); idx++)
     	  {
-    	  	 if (strings[idx].equals("*"))
+    	  	 if (strings[idx].getString().equals("*"))
+    	  	   would = true;
+    	  	 else if (strings[idx].getString().equals("./*"))
     	  	   would = true;
     	  	 else
     	       would = doesFilterStringMatch(strings[idx].getString(), remoteObjectAbsoluteName, strings[idx].getParentSystemFilter().areStringsCaseSensitive());