More sensible results data, better order of results page