Integration: Add user location to near-by notification and rename some notification fields