Upgrade tree control functions to include simple non-agent forms