Add query calls to My events
Fixed merge errors