Add dataset search and revert to simple search