Fix empty fields