more progress on reworking Search