Have search results show up in searchlist. Fix minor toMap bug.