Feature/search span optimization