Resolved conflicts: sorting + search tab