Fixed overrun in search and list