Goals: Fix calculated fill when using multiple 'up to' statements in different priority levels (#1312)
