Working on invoice filtering