Do not use Files.move when filter in effect and filter rename

As Stuart suggested. Also, the Files.move should not be even
attempted if filter is given, and use the fallback immediately