Filter upload dir even for non-private docs

If you don't do this, it's going to result in huge headaches when the Docs
change their privacy settings