diff --git a/htdocs/luci-static/resources/view/tailscale/setting.js b/htdocs/luci-static/resources/view/tailscale/setting.js
index 66be995..ffac984 100644
--- a/htdocs/luci-static/resources/view/tailscale/setting.js
+++ b/htdocs/luci-static/resources/view/tailscale/setting.js
@@ -18,34 +18,30 @@ var callServiceList = rpc.declare({
 	expect: { '': {} }
 });
 
-function enquoteBigNumber(str) {
-	return str.replace(/("\w+"):\s*(\d+)/g, '$1:"$2"');
-}
-
 function getStatus() {
-	var status = {};
-	return Promise.resolve(callServiceList('tailscale')).then(function (res) {
+	var status = {
+		isRunning: false,
+		backendState: undefined,
+		authURL: undefined,
+		displayName: undefined
+	};
+	return Promise.resolve(callServiceList('tailscale')).then(res => {
 		try {
 			status.isRunning = res['tailscale']['instances']['instance1']['running'];
 		} catch (e) {
-			status.isRunning = false;
+			return status;
 		}
-		return fs.exec("/usr/sbin/tailscale", ["status", "--json"]);
-	}).then(function(res) {
-		var tailscaleStatus = JSON.parse(enquoteBigNumber(res.stdout));
-		if (!tailscaleStatus.AuthURL && tailscaleStatus.BackendState == "NeedsLogin") {
-			fs.exec("/usr/sbin/tailscale", ["login"]);
-		}
-		status.backendState = tailscaleStatus.BackendState;
-		status.authURL = tailscaleStatus.AuthURL;
-		status.displayName = status.backendState == "Running" ? tailscaleStatus.User[tailscaleStatus.Self.UserID].DisplayName : undefined;
-		return status;
-	}).catch(function(error) {
-		status.backendState = undefined;
-		status.authURL = undefined;
-		status.displayName = undefined;
-		return status;
-	});
+		return fs.exec("/usr/sbin/tailscale", ["status", "--json"]).then(res => {
+			const tailscaleStatus = JSON.parse(res.stdout.replace(/("\w+"):\s*(\d+)/g, '$1:"$2"'));
+			if (!tailscaleStatus.AuthURL && tailscaleStatus.BackendState === "NeedsLogin") {
+				fs.exec("/usr/sbin/tailscale", ["login"]);
+			}
+			status.backendState = tailscaleStatus.BackendState;
+			status.authURL = tailscaleStatus.AuthURL;
+			status.displayName = (status.backendState === "Running") ? 	tailscaleStatus.User[tailscaleStatus.Self.UserID].DisplayName : undefined;
+			return status;
+		});
+	}).catch(() => status);
 }
 
 function renderStatus(isRunning) {
@@ -109,84 +105,86 @@ return view.extend({
 			});
 
 			return E('div', { class: 'cbi-section', id: 'status_bar' }, [
-					E('p', { id: 'service_status' }, _('Collecting data ...'))
+				E('p', { id: 'service_status' }, _('Collecting data ...'))
 			]);
 		}
 
 		s = m.section(form.NamedSection, 'settings', 'config');
-		s.tab('basic',_('Basic Settings'));
+		s.tab('basic', _('Basic Settings'));
 
-		o = s.taboption('basic',form.Flag, 'enabled', _('Enable'));
+		o = s.taboption('basic', form.Flag, 'enabled', _('Enable'));
 		o.default = o.disabled;
 		o.rmempty = false;
 
-		o = s.taboption('basic',form.DummyValue, 'login_status', _('Login Status'));
+		o = s.taboption('basic', form.DummyValue, 'login_status', _('Login Status'));
 		o.depends('enabled', '1');
 		o.renderWidget = function(section_id, option_id) {
 			return E('div', { 'id': 'login_status_div' }, _('Collecting data ...'));
 		};
 
-		o = s.taboption('basic',form.Value, 'port', _('Port'), _('Set the Tailscale port number.'));
+		o = s.taboption('basic', form.Value, 'port', _('Port'), _('Set the Tailscale port number.'));
 		o.datatype = 'port';
 		o.default = '41641';
 		o.rmempty = false;
 
-		o = s.taboption('basic',form.Value, 'config_path', _('Workdir'), _('The working directory contains config files, audit logs, and runtime info.'));
+		o = s.taboption('basic', form.Value, 'config_path', _('Workdir'), _('The working directory contains config files, audit logs, and runtime info.'));
 		o.default = '/etc/tailscale';
 		o.rmempty = false;
 
-		o = s.taboption('basic',form.ListValue, 'fw_mode', _('Firewall Mode'));
+		o = s.taboption('basic', form.ListValue, 'fw_mode', _('Firewall Mode'));
 		o.value('nftables', 'nftables');
 		o.value('iptables', 'iptables');
 		o.default = 'nftables';
 		o.rmempty = false;
 
-		o = s.taboption('basic',form.Flag, 'log_stdout', _('StdOut Log'), _('Logging program activities.'));
+		o = s.taboption('basic', form.Flag, 'log_stdout', _('StdOut Log'), _('Logging program activities.'));
 		o.default = o.enabled;
 		o.rmempty = false;
 
-		o = s.taboption('basic',form.Flag, 'log_stderr', _('StdErr Log'), _('Logging program errors and exceptions.'));
+		o = s.taboption('basic', form.Flag, 'log_stderr', _('StdErr Log'), _('Logging program errors and exceptions.'));
 		o.default = o.enabled;
 		o.rmempty = false;
 
-		s.tab('advance',_('Advanced Settings'));
+		s.tab('advance', _('Advanced Settings'));
 
-		o = s.taboption('advance',form.Flag, 'acceptRoutes', _('Accept Routes'), _('Accept subnet routes that other nodes advertise.'));
+		o = s.taboption('advance', form.Flag, 'acceptRoutes', _('Accept Routes'), _('Accept subnet routes that other nodes advertise.'));
 		o.default = o.disabled;
 		o.rmempty = false;
 
-		o = s.taboption('advance',form.Value, 'hostname', _('Device Name'), _("Leave blank to use the device's hostname."));
+		o = s.taboption('advance', form.Value, 'hostname', _('Device Name'), _("Leave blank to use the device's hostname."));
 		o.default = '';
 		o.rmempty = true;
 
-		o = s.taboption('advance',form.Flag, 'acceptDNS', _('Accept DNS'), _('Accept DNS configuration from the Tailscale admin console.'));
+		o = s.taboption('advance', form.Flag, 'acceptDNS', _('Accept DNS'), _('Accept DNS configuration from the Tailscale admin console.'));
 		o.default = o.enabled;
 		o.rmempty = false;
 
-		o = s.taboption('advance',form.Flag, 'advertiseExitNode', _('Exit Node'), _('Offer to be an exit node for outbound internet traffic from the Tailscale network.'));
+		o = s.taboption('advance', form.Flag, 'advertiseExitNode', _('Exit Node'), _('Offer to be an exit node for outbound internet traffic from the Tailscale network.'));
 		o.default = o.disabled;
 		o.rmempty = false;
 
-		o = s.taboption('advance',form.Value, 'advertiseRoutes', _('Expose Subnets'), _('Expose physical network routes into Tailscale, e.g. <code>10.0.0.0/24</code>.'));
+		o = s.taboption('advance', form.DynamicList, 'advertiseRoutes', _('Expose Subnets'), _('Expose physical network routes into Tailscale, e.g. <code>10.0.0.0/24</code>.'));
 		o.default = '';
 		o.rmempty = true;
 
-		o = s.taboption('advance',form.Flag, 's2s', _('Site To Site'), _('Use site-to-site layer 3 networking to connect subnets on the Tailscale network.'));
+		o = s.taboption('advance', form.Flag, 's2s', _('Site To Site'), _('Use site-to-site layer 3 networking to connect subnets on the Tailscale network.'));
 		o.default = o.disabled;
 		o.depends('acceptRoutes', '1');
 		o.rmempty = false;
 
-		o = s.taboption('advance',form.MultiValue, 'access', _('Access Control'));
+		o = s.taboption('advance', form.MultiValue, 'access', _('Access Control'));
 		o.value('tsfwlan', _('Tailscale access LAN'));
 		o.value('tsfwwan', _('Tailscale access WAN'));
 		o.value('lanfwts', _('LAN access Tailscale'));
 		o.value('wanfwts', _('WAN access Tailscale'));
 		o.default = "tsfwlan tsfwwan lanfwts";
-		o.rmempty = false;
+		o.rmempty = true;
 
-		s.tab('extra',_('Extra Settings'));
+		s.tab('extra', _('Extra Settings'));
 
 		o = s.taboption('extra', form.DynamicList, 'flags', _('Additional Flags'), String.format(_('List of extra flags. Format: --flags=value, e.g. <code>--exit-node=10.0.0.1</code>. <br> %s for enabling settings upon the initiation of Tailscale.'), '<a href="https://tailscale.com/kb/1241/tailscale-up" target="_blank">' + _('Available flags') + '</a>'));
+		o.default = '';
+		o.rmempty = true;
 
 		s = m.section(form.NamedSection, 'settings', 'config');
 		s.title = _('Custom Server Settings');
diff --git a/root/etc/init.d/tailscale b/root/etc/init.d/tailscale
index 69f40ba..500cc1f 100755
--- a/root/etc/init.d/tailscale
+++ b/root/etc/init.d/tailscale
@@ -44,7 +44,7 @@ custom_instance() {
 	[ -n "$hostname" ] && ARGS="$ARGS --hostname=$hostname"
 	[ "$acceptDNS" = "0" ] && ARGS="$ARGS --accept-dns=false"
 	[ "$advertiseExitNode" = "1" ] && ARGS="$ARGS --advertise-exit-node"
-	[ -n "$advertiseRoutes" ] && ARGS="$ARGS --advertise-routes=$advertiseRoutes"
+	[ -n "$advertiseRoutes" ] && ARGS="$ARGS --advertise-routes=$(echo $advertiseRoutes | tr ' ' ',')"
 	[ "$s2s" = "1" ] && ARGS="$ARGS --snat-subnet-routes=false"
 	[ -n "$flags" ] && ARGS="$ARGS $flags"
 	[ -n "$loginServer" ] && ARGS="$ARGS --login-server=$loginServer"
@@ -100,7 +100,6 @@ custom_instance() {
 		else
 			uci -q delete firewall.tszone
 		fi
-
 		if [ "${access//tsfwlan/}" != "$access" ]; then
 			uci set firewall.tsfwlan=forwarding
 			uci set firewall.tsfwlan.dest='lan'