[PB] {other} Further improvements to location services