Fix nearby lists

Patch up for OTM2