Add file_name_name setting & remove field if false