diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim
index 19323b6..9aeb44a 100644
--- a/autoload/ctrlp.vim
+++ b/autoload/ctrlp.vim
@@ -175,12 +175,12 @@ fu! s:DirAndFile(entries)
 			en | el
 				cal add(items[0], each)
 			en
-		el
+		elsei etype == 'link'
 			if s:folsym
-				cal add(items[1], each)
-			el | if etype != 'link'
-				cal add(items[1], each)
-			en | en
+				cal add(items[!isdirectory(each)], each)
+			en
+		el
+			cal add(items[1], each)
 		en
 	endfo
 	retu items
diff --git a/autoload/ctrlp/line.vim b/autoload/ctrlp/line.vim
index 964de64..341d08f 100644
--- a/autoload/ctrlp/line.vim
+++ b/autoload/ctrlp/line.vim
@@ -10,7 +10,7 @@ if exists('g:loaded_ctrlp_line') && g:loaded_ctrlp_line
 en
 let g:loaded_ctrlp_line = 1
 
-let s:line_var = ['ctrlp#line#init()', 'ctrlp#line#accept', 'lines', 'line']
+let s:line_var = ['ctrlp#line#init()', 'ctrlp#line#accept', 'lines', 'lns']
 
 let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
 	\ ? add(g:ctrlp_ext_vars, s:line_var) : [s:line_var]