working on date search fix