Make search in list work better.