Fixed some location linking