Finished implementing search.
Merged conflict in eventslist.