-hn = s:option(Value, "hostname", translate("hostnames_hostname"))
-ip = s:option(Value, "ipaddr", translate("hostnames_address"))
-for i, dataset in ipairs(luci.sys.net.arptable()) do
+hn = s:option(Value, "name", translate("Hostname"))
+hn.datatype = "hostname"
+hn.rmempty = true
+
+ip = s:option(Value, "ip", translate("IP address"))
+ip.datatype = "ipaddr"
+ip.rmempty = true
+
+local arptable = luci.sys.net.arptable() or {}
+for i, dataset in ipairs(arptable) do