Changes to event handler
Changes to EventHandler
Add event to search button