Minor fixes to editor template for selection variables