Added subtotal and grand totals to location report