Fix SQL behind Estimate->listEstimates() method to reflect new DB schema
Fix SQL behind Invoice->listInvoices() method to reflect new DB schema