Switch uploadStart to normal form and check format based on filename ext

Fixes #2286