381 asset type selection

Includes new behavior as outlined in the comments of #381.