added changeable VatId and fixed PQ bug