diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 6eb9d98971..cd74b2a283 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -193,7 +193,7 @@ def inspect(var, render=True):
 	return get_jenv().from_string(html).render(context)
 
 
-def web_block(template, values, **kwargs):
+def web_block(template, values=None, **kwargs):
 	options = {"template": template, "values": values}
 	options.update(kwargs)
 	return web_blocks([options])
diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js
index ab4f534c61..a58c854e5c 100644
--- a/frappe/website/doctype/web_page/web_page.js
+++ b/frappe/website/doctype/web_page/web_page.js
@@ -19,6 +19,15 @@ frappe.ui.form.on('Web Page', {
 	insert_code: function(frm) {
 		frm.events.layout(frm);
 	},
+	onload: function(frm) {
+		frm.set_query('web_template', 'page_blocks', function() {
+			return {
+				filters: {
+					"type": 'Section'
+				}
+			};
+		});
+	},
 	refresh: function(frm) {
 		if (frm.doc.template_path) {
 			frm.set_read_only();
@@ -40,7 +49,6 @@ frappe.ui.form.on('Web Page', {
 			frm.set_value('end_date', end_date);
 		}
 	},
-
 	set_meta_tags(frm) {
 		frappe.utils.set_meta_tag(frm.doc.route);
 	}
diff --git a/frappe/website/doctype/web_template/web_template.json b/frappe/website/doctype/web_template/web_template.json
index d50266b7b1..5ae4452c93 100644
--- a/frappe/website/doctype/web_template/web_template.json
+++ b/frappe/website/doctype/web_template/web_template.json
@@ -36,12 +36,13 @@
    "label": "Standard"
   },
   {
+   "default": "Section",
    "fieldname": "type",
    "fieldtype": "Select",
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Type",
-   "options": "Section\nNavbar\nFooter"
+   "options": "Component\nSection\nNavbar\nFooter"
   },
   {
    "depends_on": "standard",
@@ -59,7 +60,7 @@
    "link_fieldname": "web_template"
   }
  ],
- "modified": "2020-10-20 15:08:57.027962",
+ "modified": "2020-10-22 17:36:45.042517",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Web Template",
@@ -82,4 +83,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}