Update map handling to go with geo location and sane defaults