location api fixes
code
code