Update the unserialize function from "geolocation container". Clean up.