Added lost lines from sortnfilter branch