Pre-fill filename during upload; tweak order; placeholders

Fixes #2515