Fixes for events module requested by YRS NYC staff