[PB] {refactoring} Improved behaviour of location services