Added new-style filtering to invoice page