DATACASS-121 - fixed Date querying