Squash: fixing broken data-options