Change event name
Add search for location and success and error events