tooltip and search client changes