CAL-355 update search API with search context param