Removing reliance on result order for batch geocode queries.
Adding location override spec, fixing filename mismatch