Issue346 search focus