Update to use new tables (working but need a form to specific a template by evaluation) -refs BT#8052