Preserve empty fields
Don't forget tag format selection anymore