fix issues of updating search between switches