FEATURE Client Index Search updated