AAD-95: shapefile multiple upload duplicates form widgets