Select problem by type

Internal/temporary PR for review.