diff --git a/www/manager/dc/SecurityGroups.js b/www/manager/dc/SecurityGroups.js
index 4f51b53a..6619a325 100644
--- a/www/manager/dc/SecurityGroups.js
+++ b/www/manager/dc/SecurityGroups.js
@@ -200,7 +200,7 @@ Ext.define('PVE.SecurityGroups', {
 	var rule_panel = Ext.createWidget('pveFirewallRules', {
 	    region: 'center',
 	    allow_groups: false,
-	    ipset_base_url: '/cluster/firewall/ipset',
+	    ipset_base_url: '/cluster/firewall/refs',
 	    tbar_prefix: '<b>' + gettext('Rules') + ':</b>',
 	    flex: 0.75,
 	    border: false
diff --git a/www/manager/form/IPSetSelector.js b/www/manager/form/IPSetSelector.js
index 03c64004..a32ff6df 100644
--- a/www/manager/form/IPSetSelector.js
+++ b/www/manager/form/IPSetSelector.js
@@ -13,29 +13,33 @@ Ext.define('PVE.form.IPSetSelector', {
 
 	var store = Ext.create('Ext.data.Store', {
 	    autoLoad: true,
-	    fields: [ { name: 'name', 
-			convert: function(v) {  return '+' + v; }},
-		      'comment' ],
-	    idProperty: 'name',
+	    fields: [ 'type', 'name', 'ref', 'comment' ],
+	    idProperty: 'ref',
 	    proxy: {
 		type: 'pve',
 		url: "/api2/json" + me.base_url
 	    },
 	    sorters: {
-		property: 'name',
+		property: 'ref',
 		order: 'DESC'
 	    }
 	});
 
 	Ext.apply(me, {
 	    store: store,
-	    valueField: 'name',
-	    displayField: 'name',
+	    valueField: 'ref',
+	    displayField: 'ref',
             listConfig: {
 		columns: [
 		    {
-			header: gettext('IPSet'),
-			dataIndex: 'name',
+			header: gettext('Type'),
+			dataIndex: 'type',
+			hideable: false,
+			width: 60
+		    },
+		    {
+			header: gettext('Name'),
+			dataIndex: 'ref',
 			hideable: false,
 			width: 100
 		    },
diff --git a/www/manager/panel/Firewall.js b/www/manager/panel/Firewall.js
index bc4ca701..5beb68a0 100644
--- a/www/manager/panel/Firewall.js
+++ b/www/manager/panel/Firewall.js
@@ -26,8 +26,8 @@ Ext.define('PVE.panel.Firewall', {
 		title: 'Rules',
 		allow_iface: true,
 		base_url: me.base_url + '/rules',
-		ipset_base_url: me.fwtype === 'vm' ? (me.base_url + '/ipset') : 
-		    '/cluster/firewall/ipset',
+		ipset_base_url: me.fwtype === 'vm' ? (me.base_url + '/refs') : 
+		    '/cluster/firewall/refs',
 		itemId: 'rules'
 	    }
 	];