#14438 Removed principal scope, moved select to the partial view.