When filtering for a directory we now stop evaluation if all remaining files are in the same directory.