Refined the Advanced FieldSet for the download tool