Updated to add keywords from event name