Some ameliorations to declarationTva controller