Added markup, made geo lookup error tolerant