Added date search support