WDTK-277 - improved accessibility of search