Simplify queries & add support for non-organiaztion invoices