Added invoice_type filter