More progress on search UI