update context, remove search api dependencies