Fixed context for current_search