pass full location info through to invoice template, #28080