Added some missed files, fixed the search order, fixed event chunk sizing