Fix events searching. Re-adds the location field to the search parameters, and fixes the calendar searching