#95820 fix neighbourhood selection problems