diff --git a/frappe/__init__.py b/frappe/__init__.py
index ca148e39a9..033b9fa88e 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.5.7'
+__version__ = '8.5.8'
 __title__ = "Frappe Framework"
 
 local = Local()
diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py
index 12d0fc9f44..3514c1b877 100644
--- a/frappe/core/page/data_import_tool/importer.py
+++ b/frappe/core/page/data_import_tool/importer.py
@@ -133,6 +133,11 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 								elif fieldtype in ("Image", "Attach Image", "Attach"):
 									# added file to attachments list
 									attachments.append(d[fieldname])
+
+								elif fieldtype in ("Link", "Dynamic Link") and d[fieldname]:
+									# as fields can be saved in the number format(long type) in data import template
+									d[fieldname] = cstr(d[fieldname])
+
 							except IndexError:
 								pass
 
diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js
index d1d07493f2..02940e1bec 100644
--- a/frappe/public/js/frappe/list/list_renderer.js
+++ b/frappe/public/js/frappe/list/list_renderer.js
@@ -23,6 +23,7 @@ frappe.views.ListRenderer = Class.extend({
 		this.page_title = __(this.doctype);
 
 		this.set_wrapper();
+		this.setup_filterable();
 		this.prepare_render_view();
 
 		// flag to enable/disable realtime updates in list_view
@@ -270,7 +271,7 @@ frappe.views.ListRenderer = Class.extend({
 
 	setup_filterable: function () {
 		var me = this;
-		this.wrapper.on('click', '.filterable', function (e) {
+		this.list_view.wrapper.on('click', '.result-list .filterable', function (e) {
 			var filters = $(this).attr('data-filter').split('|');
 			var added = false;
 
@@ -332,7 +333,6 @@ frappe.views.ListRenderer = Class.extend({
 			this.render_tags($item_container, value);
 		});
 
-		this.setup_filterable();
 	},
 
 	// returns html for a data item,