Improved the date searching yet again