adding setupDatabase to two new methods
Clean up of Term and BaseTerm and other issues for network queries