fixed all empty fields