build 846 Better support for 'search' function