Single-category spreadsheet expansion

Fixes #2590