Improve search in list