Initial adjustments to work properly within search