Added to invoice fields being returned
Also fixed some issues with invoice queries