Better organization of the results, first pass at wrun-search