Move template <script> out
Do not fail when filename contains no `-` characters #886
Uploads cleanup button #887