Cleaned up fixed/portable dir swap filters bug