Added further booking handling, start/end time for events, updated
queries, fixed json mapping