Improved support of search