New style search partially implemented