More work on search adaper