Improved Date/Location detection