ZSS-693: Sorting should shift formula accordingly