residential not have vat field + small changes in output of boolean fields