Fix search and add more