Added cookies to locate page
merge locate in master