Client tenant search list, mislaid code replaced