faster transition from stops to stop by making the address cell’s map a singleton