Optimize by pruning by event type (update)