Advanced upload fields refactored to fix flw with multiple fields