improved list handling and search