Adding correct sorting to per-match search view