Add short list type selection to Outpost
Improve controller logic