Fix way loc when useOriginalID is false

Also fix useOriginalID as I do not believe it was working correctly.