Fix #163 - Add list searching