Improve spec generation
Collapse scales inside each vis