Fixed date searching. Improved prefilling of data