Neighbourhood location not kept being kept when navigating to a single listing

Hi,

When navigating from a neighbourhood to a single listing the users location gets changed from the ‘neighbourhood’ to the ‘city’

In more detail, when a user searches or selects a neighbourhood there location gets set as the neighbourhood in the ‘location switcher’ and ‘search’, when they click on a listing in that neighbourhood their location gets changed to the city. This means when the user navigates to any other pages they lose their selected neighbourhood.

Is there any way to circumvent this?

Thank you,
Harry