Finish fixing of location bug
Fix JS