[FIX] #792 deal with date ranges as well having a company set or not

[FIX] #792 deal with date ranges as well having a company set or not #536