3.6/dev intrepid svoigt

Bug fixes on Events pages