Added some Location guessing and Organization prefix handling