Improved search functionality + date search