diff --git a/src/java/net/brutex/xservices/ws/rs/FileInfo.java b/src/java/net/brutex/xservices/ws/rs/FileInfo.java
index 2bba0f7..834dd1a 100644
--- a/src/java/net/brutex/xservices/ws/rs/FileInfo.java
+++ b/src/java/net/brutex/xservices/ws/rs/FileInfo.java
@@ -38,7 +38,7 @@ import net.brutex.xservices.ws.XServicesFault;
  */
 
 @Path("/FileService/")
-@Produces({ "application/xml" })
+@Produces({ "text/xml" })
 public abstract interface FileInfo {
 
 	public final static String BASE_PATH = "/FileService/";
diff --git a/src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java b/src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
index ebcbe3b..eb60b80 100644
--- a/src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
+++ b/src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
@@ -139,6 +139,12 @@ public class FileInfoImpl  implements FileInfo {
 			logger.info("FileWalker returned '"+finder.getCount()+"' hits. '" + finder.getTotal() + "' files have been scanned.");
 			List<Path> result = finder.getResult();
 	    	for(Path f : result) {
+	    		if(! withDirectories) {
+	    			if(f.toFile().isDirectory()) continue;
+	    		}
+	    		if(! withFiles) {
+	    			if(f.toFile().isFile()) continue;
+	    		}
 	    		list.add(new FileInfoType(f, baseuri));
 	    	}
 		} catch (IOException e2) {