Added selectedEvent observable
Fix merge conflicts