More progress on modal prefix search.