Adapt to new spreadsheet structure and filter