[refactor] Refined default Location functionality