Refactoring. Add currency filter on invoices/CountByData and invoices/countByMonth