resolve empty fields