LPS-38611 Make template selection simpler and consistent with structure selection
LPS-38611 SF